Put tests side-by-side with main code

mark-wiemer-org · Aug 13, 2023 · 7b30279 · 7b30279
1 parent 273168a
commit 7b30279
Show file tree

Hide file tree

Showing 138 changed files with 11 additions and 32,970 deletions.
diff --git a/src/test/suite/common/codeUtil.test.ts → src/common/codeUtil.test.ts b/src/test/suite/common/codeUtil.test.ts → src/common/codeUtil.test.ts
@@ -1,6 +1,5 @@
 import * as assert from 'assert';
-import { CodeUtil, getSelectedText } from '../../../common/codeUtil';
-import * as vscode from 'vscode';
+import { CodeUtil } from './codeUtil';
 
 suite('Code utils', () => {
     suite('purify', () => {

diff --git a/src/test/suite/parser/parser.test.ts → src/parser/parser.test.ts b/src/test/suite/parser/parser.test.ts → src/parser/parser.test.ts
@@ -1,8 +1,8 @@
-import { getDocument } from '../../utils';
+import { getDocument } from '../test/utils';
 import * as assert from 'assert';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { Parser } from '../../../parser/parser';
+import { Parser } from '../parser/parser';
 
 suite('Parser', () => {
     suite('detectVariableByLine', () => {
@@ -81,11 +81,7 @@ suite('Parser', () => {
             __dirname,
             '..',
             '..',
-            '..',
-            '..',
             'src',
-            'test',
-            'suite',
             'parser',
             'samples',
         );

diff --git a/...parser/samples/117-ten-thousand-lines.ahk → ...parser/samples/117-ten-thousand-lines.ahk b/...parser/samples/117-ten-thousand-lines.ahk → ...parser/samples/117-ten-thousand-lines.ahk
diff --git a/...letionProvider/completionProvider.test.ts → src/providers/completionProvider.test.ts b/...letionProvider/completionProvider.test.ts → src/providers/completionProvider.test.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import { assert } from 'chai';
-import { provideCompletionItemsInner } from '../../../../providers/completionProvider';
+import { provideCompletionItemsInner } from './completionProvider';
 
 // tests for completionItemsForMethod
 suite('completionProvider', () => {

diff --git a/src/test/suite/format/format.test.ts → src/providers/format.test.ts b/src/test/suite/format/format.test.ts → src/providers/format.test.ts
@@ -1,14 +1,13 @@
-// TODO move to providers/formatting/formattingProvider.test.ts
-import { getDocument } from '../../utils';
+import { getDocument } from '../test/utils';
 import * as assert from 'assert';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import {
     FormatProvider,
     internalFormat,
-} from '../../../providers/formattingProvider';
-import { FormatOptions } from '../../../providers/formattingProvider.types';
+} from '../providers/formattingProvider';
+import { FormatOptions } from '../providers/formattingProvider.types';
 
 const inFilenameSuffix = '.in.ahk';
 const outFilenameSuffix = '.out.ahk';
@@ -111,12 +110,8 @@ const filesParentPath = path.join(
     __dirname,
     '..',
     '..',
-    '..',
-    '..',
     'src',
-    'test',
-    'suite',
-    'format',
+    'providers',
     'samples',
 );
 

diff --git a/...rmatting/formattingProvider.utils.test.ts → ...roviders/formattingProvider.utils.test.ts b/...rmatting/formattingProvider.utils.test.ts → ...roviders/formattingProvider.utils.test.ts
@@ -18,7 +18,7 @@ import {
     purify,
     removeEmptyLines,
     trimExtraSpaces,
-} from '../../../../providers/formattingProvider.utils';
+} from './formattingProvider.utils';
 
 suite('FormattingProvider utils', () => {
     // Default formatting options
@@ -1063,14 +1063,8 @@ suite('FormattingProvider utils', () => {
             __dirname,
             '..',
             '..',
-            '..',
-            '..',
-            '..',
             'src',
-            'test',
-            'suite',
             'providers',
-            'formatting',
             'samples',
         );
 

diff --git a/...s/formatting/samples/1-one-empty-line.txt → src/providers/samples/1-one-empty-line.txt b/...s/formatting/samples/1-one-empty-line.txt → src/providers/samples/1-one-empty-line.txt
diff --git a/...amples/119-semicolon-inside-string.in.ahk → ...amples/119-semicolon-inside-string.in.ahk b/...amples/119-semicolon-inside-string.in.ahk → ...amples/119-semicolon-inside-string.in.ahk
diff --git a/...mples/119-semicolon-inside-string.out.ahk → ...mples/119-semicolon-inside-string.out.ahk b/...mples/119-semicolon-inside-string.out.ahk → ...mples/119-semicolon-inside-string.out.ahk
diff --git a/...samples/161-colon-on-last-position.in.ahk → ...samples/161-colon-on-last-position.in.ahk b/...samples/161-colon-on-last-position.in.ahk → ...samples/161-colon-on-last-position.in.ahk
diff --git a/...amples/161-colon-on-last-position.out.ahk → ...amples/161-colon-on-last-position.out.ahk b/...amples/161-colon-on-last-position.out.ahk → ...amples/161-colon-on-last-position.out.ahk
diff --git a/.../format/samples/180-if-else-braces.in.ahk → ...oviders/samples/180-if-else-braces.in.ahk b/.../format/samples/180-if-else-braces.in.ahk → ...oviders/samples/180-if-else-braces.in.ahk
diff --git a/...format/samples/180-if-else-braces.out.ahk → ...viders/samples/180-if-else-braces.out.ahk b/...format/samples/180-if-else-braces.out.ahk → ...viders/samples/180-if-else-braces.out.ahk
diff --git a/...rmat/samples/182-multiple-newlines.in.ahk → ...ders/samples/182-multiple-newlines.in.ahk b/...rmat/samples/182-multiple-newlines.in.ahk → ...ders/samples/182-multiple-newlines.in.ahk
diff --git a/...mat/samples/182-multiple-newlines.out.ahk → ...ers/samples/182-multiple-newlines.out.ahk b/...mat/samples/182-multiple-newlines.out.ahk → ...ers/samples/182-multiple-newlines.out.ahk
diff --git a/...84-continuation-section-expression.in.ahk → ...84-continuation-section-expression.in.ahk b/...84-continuation-section-expression.in.ahk → ...84-continuation-section-expression.in.ahk
diff --git a/...4-continuation-section-expression.out.ahk → ...4-continuation-section-expression.out.ahk b/...4-continuation-section-expression.out.ahk → ...4-continuation-section-expression.out.ahk
diff --git a/...es/184-continuation-section-object.in.ahk → ...es/184-continuation-section-object.in.ahk b/...es/184-continuation-section-object.in.ahk → ...es/184-continuation-section-object.in.ahk
diff --git a/...s/184-continuation-section-object.out.ahk → ...s/184-continuation-section-object.out.ahk b/...s/184-continuation-section-object.out.ahk → ...s/184-continuation-section-object.out.ahk
diff --git a/...ples/184-continuation-section-text.in.ahk → ...ples/184-continuation-section-text.in.ahk b/...ples/184-continuation-section-text.in.ahk → ...ples/184-continuation-section-text.in.ahk
diff --git a/...les/184-continuation-section-text.out.ahk → ...les/184-continuation-section-text.out.ahk b/...les/184-continuation-section-text.out.ahk → ...les/184-continuation-section-text.out.ahk
diff --git a/...e/format/samples/185-block-comment.in.ahk → ...roviders/samples/185-block-comment.in.ahk b/...e/format/samples/185-block-comment.in.ahk → ...roviders/samples/185-block-comment.in.ahk
diff --git a/.../format/samples/185-block-comment.out.ahk → ...oviders/samples/185-block-comment.out.ahk b/.../format/samples/185-block-comment.out.ahk → ...oviders/samples/185-block-comment.out.ahk
diff --git a/...amples/187-comments-at-end-of-line.in.ahk → ...amples/187-comments-at-end-of-line.in.ahk b/...amples/187-comments-at-end-of-line.in.ahk → ...amples/187-comments-at-end-of-line.in.ahk
diff --git a/...mples/187-comments-at-end-of-line.out.ahk → ...mples/187-comments-at-end-of-line.out.ahk b/...mples/187-comments-at-end-of-line.out.ahk → ...mples/187-comments-at-end-of-line.out.ahk
diff --git a/...mples/188-one-command-code-in-text.in.ahk → ...mples/188-one-command-code-in-text.in.ahk b/...mples/188-one-command-code-in-text.in.ahk → ...mples/188-one-command-code-in-text.in.ahk
diff --git a/...ples/188-one-command-code-in-text.out.ahk → ...ples/188-one-command-code-in-text.out.ahk b/...ples/188-one-command-code-in-text.out.ahk → ...ples/188-one-command-code-in-text.out.ahk
diff --git a/...t/samples/189-space-at-end-of-line.in.ahk → ...s/samples/189-space-at-end-of-line.in.ahk b/...t/samples/189-space-at-end-of-line.in.ahk → ...s/samples/189-space-at-end-of-line.in.ahk
diff --git a/.../samples/189-space-at-end-of-line.out.ahk → .../samples/189-space-at-end-of-line.out.ahk b/.../samples/189-space-at-end-of-line.out.ahk → .../samples/189-space-at-end-of-line.out.ahk
diff --git a/...t/samples/192-preserve-indent-true.in.ahk → ...s/samples/192-preserve-indent-true.in.ahk b/...t/samples/192-preserve-indent-true.in.ahk → ...s/samples/192-preserve-indent-true.in.ahk
diff --git a/.../samples/192-preserve-indent-true.out.ahk → .../samples/192-preserve-indent-true.out.ahk b/.../samples/192-preserve-indent-true.out.ahk → .../samples/192-preserve-indent-true.out.ahk
diff --git a/.../formatting/samples/2-two-empty-lines.txt → src/providers/samples/2-two-empty-lines.txt b/.../formatting/samples/2-two-empty-lines.txt → src/providers/samples/2-two-empty-lines.txt
diff --git a/...format/samples/25-multiline-string.in.ahk → ...viders/samples/25-multiline-string.in.ahk b/...format/samples/25-multiline-string.in.ahk → ...viders/samples/25-multiline-string.in.ahk
diff --git a/...ormat/samples/25-multiline-string.out.ahk → ...iders/samples/25-multiline-string.out.ahk b/...ormat/samples/25-multiline-string.out.ahk → ...iders/samples/25-multiline-string.out.ahk
diff --git a/...ite/format/samples/255-close-brace.in.ahk → src/providers/samples/255-close-brace.in.ahk b/...ite/format/samples/255-close-brace.in.ahk → src/providers/samples/255-close-brace.in.ahk
diff --git a/...te/format/samples/255-close-brace.out.ahk → ...providers/samples/255-close-brace.out.ahk b/...te/format/samples/255-close-brace.out.ahk → ...providers/samples/255-close-brace.out.ahk
diff --git a/...t/suite/format/samples/255-else-if.in.ahk → src/providers/samples/255-else-if.in.ahk b/...t/suite/format/samples/255-else-if.in.ahk → src/providers/samples/255-else-if.in.ahk
diff --git a/.../suite/format/samples/255-else-if.out.ahk → src/providers/samples/255-else-if.out.ahk b/.../suite/format/samples/255-else-if.out.ahk → src/providers/samples/255-else-if.out.ahk
diff --git a/...ite/format/samples/255-if-loop-mix.in.ahk → src/providers/samples/255-if-loop-mix.in.ahk b/...ite/format/samples/255-if-loop-mix.in.ahk → src/providers/samples/255-if-loop-mix.in.ahk
diff --git a/...te/format/samples/255-if-loop-mix.out.ahk → ...providers/samples/255-if-loop-mix.out.ahk b/...te/format/samples/255-if-loop-mix.out.ahk → ...providers/samples/255-if-loop-mix.out.ahk
diff --git a/...format/samples/255-return-function.in.ahk → ...viders/samples/255-return-function.in.ahk b/...format/samples/255-return-function.in.ahk → ...viders/samples/255-return-function.in.ahk
diff --git a/...ormat/samples/255-return-function.out.ahk → ...iders/samples/255-return-function.out.ahk b/...ormat/samples/255-return-function.out.ahk → ...iders/samples/255-return-function.out.ahk
diff --git a/...te/format/samples/255-return-label.in.ahk → ...providers/samples/255-return-label.in.ahk b/...te/format/samples/255-return-label.in.ahk → ...providers/samples/255-return-label.in.ahk
diff --git a/...e/format/samples/255-return-label.out.ahk → ...roviders/samples/255-return-label.out.ahk b/...e/format/samples/255-return-label.out.ahk → ...roviders/samples/255-return-label.out.ahk
diff --git a/...te/format/samples/255-style-allman.in.ahk → ...providers/samples/255-style-allman.in.ahk b/...te/format/samples/255-style-allman.in.ahk → ...providers/samples/255-style-allman.in.ahk
diff --git a/...e/format/samples/255-style-allman.out.ahk → ...roviders/samples/255-style-allman.out.ahk b/...e/format/samples/255-style-allman.out.ahk → ...roviders/samples/255-style-allman.out.ahk
diff --git a/...e/format/samples/255-style-k-and-r.in.ahk → ...roviders/samples/255-style-k-and-r.in.ahk b/...e/format/samples/255-style-k-and-r.in.ahk → ...roviders/samples/255-style-k-and-r.in.ahk
diff --git a/.../format/samples/255-style-k-and-r.out.ahk → ...oviders/samples/255-style-k-and-r.out.ahk b/.../format/samples/255-style-k-and-r.out.ahk → ...oviders/samples/255-style-k-and-r.out.ahk
diff --git a/...suite/format/samples/255-style-mix.in.ahk → src/providers/samples/255-style-mix.in.ahk b/...suite/format/samples/255-style-mix.in.ahk → src/providers/samples/255-style-mix.in.ahk
diff --git a/...uite/format/samples/255-style-mix.out.ahk → src/providers/samples/255-style-mix.out.ahk b/...uite/format/samples/255-style-mix.out.ahk → src/providers/samples/255-style-mix.out.ahk
diff --git a/...t/samples/255-style-one-true-brace.in.ahk → ...s/samples/255-style-one-true-brace.in.ahk b/...t/samples/255-style-one-true-brace.in.ahk → ...s/samples/255-style-one-true-brace.in.ahk
diff --git a/.../samples/255-style-one-true-brace.out.ahk → .../samples/255-style-one-true-brace.out.ahk b/.../samples/255-style-one-true-brace.out.ahk → .../samples/255-style-one-true-brace.out.ahk
diff --git a/...uite/format/samples/28-switch-case.in.ahk → src/providers/samples/28-switch-case.in.ahk b/...uite/format/samples/28-switch-case.in.ahk → src/providers/samples/28-switch-case.in.ahk
diff --git a/...ite/format/samples/28-switch-case.out.ahk → src/providers/samples/28-switch-case.out.ahk b/...ite/format/samples/28-switch-case.out.ahk → src/providers/samples/28-switch-case.out.ahk
diff --git a/.../suite/format/samples/290-ifmsgbox.in.ahk → src/providers/samples/290-ifmsgbox.in.ahk b/.../suite/format/samples/290-ifmsgbox.in.ahk → src/providers/samples/290-ifmsgbox.in.ahk
diff --git a/...suite/format/samples/290-ifmsgbox.out.ahk → src/providers/samples/290-ifmsgbox.out.ahk b/...suite/format/samples/290-ifmsgbox.out.ahk → src/providers/samples/290-ifmsgbox.out.ahk
diff --git a/...at/samples/291-single-line-comment.in.ahk → ...rs/samples/291-single-line-comment.in.ahk b/...at/samples/291-single-line-comment.in.ahk → ...rs/samples/291-single-line-comment.in.ahk
diff --git a/...t/samples/291-single-line-comment.out.ahk → ...s/samples/291-single-line-comment.out.ahk b/...t/samples/291-single-line-comment.out.ahk → ...s/samples/291-single-line-comment.out.ahk
diff --git a/...ormatting/samples/3-three-empty-lines.txt → ...providers/samples/3-three-empty-lines.txt b/...ormatting/samples/3-three-empty-lines.txt → ...providers/samples/3-three-empty-lines.txt
diff --git a/...316-if-object-continuation-section.in.ahk → ...316-if-object-continuation-section.in.ahk b/...316-if-object-continuation-section.in.ahk → ...316-if-object-continuation-section.in.ahk
diff --git a/...16-if-object-continuation-section.out.ahk → ...16-if-object-continuation-section.out.ahk b/...16-if-object-continuation-section.out.ahk → ...16-if-object-continuation-section.out.ahk
diff --git a/...samples/4-multiline-ends-with-newline.txt → ...samples/4-multiline-ends-with-newline.txt b/...samples/4-multiline-ends-with-newline.txt → ...samples/4-multiline-ends-with-newline.txt
diff --git a/...mat/samples/40-command-inside-text.in.ahk → ...ers/samples/40-command-inside-text.in.ahk b/...mat/samples/40-command-inside-text.in.ahk → ...ers/samples/40-command-inside-text.in.ahk
diff --git a/...at/samples/40-command-inside-text.out.ahk → ...rs/samples/40-command-inside-text.out.ahk b/...at/samples/40-command-inside-text.out.ahk → ...rs/samples/40-command-inside-text.out.ahk
diff --git a/...atting/samples/5-multiline-no-newline.txt → ...viders/samples/5-multiline-no-newline.txt b/...atting/samples/5-multiline-no-newline.txt → ...viders/samples/5-multiline-no-newline.txt
diff --git a/...ite/format/samples/55-if-directive.in.ahk → src/providers/samples/55-if-directive.in.ahk b/...ite/format/samples/55-if-directive.in.ahk → src/providers/samples/55-if-directive.in.ahk
diff --git a/...te/format/samples/55-if-directive.out.ahk → ...providers/samples/55-if-directive.out.ahk b/...te/format/samples/55-if-directive.out.ahk → ...providers/samples/55-if-directive.out.ahk
diff --git a/...ples/56-return-command-after-label.in.ahk → ...ples/56-return-command-after-label.in.ahk b/...ples/56-return-command-after-label.in.ahk → ...ples/56-return-command-after-label.in.ahk
diff --git a/...les/56-return-command-after-label.out.ahk → ...les/56-return-command-after-label.out.ahk b/...les/56-return-command-after-label.out.ahk → ...les/56-return-command-after-label.out.ahk
diff --git a/...samples/58-parentheses-indentation.in.ahk → ...samples/58-parentheses-indentation.in.ahk b/...samples/58-parentheses-indentation.in.ahk → ...samples/58-parentheses-indentation.in.ahk
diff --git a/...amples/58-parentheses-indentation.out.ahk → ...amples/58-parentheses-indentation.out.ahk b/...amples/58-parentheses-indentation.out.ahk → ...amples/58-parentheses-indentation.out.ahk
diff --git a/...samples/59-one-command-indentation.in.ahk → ...samples/59-one-command-indentation.in.ahk b/...samples/59-one-command-indentation.in.ahk → ...samples/59-one-command-indentation.in.ahk
diff --git a/...amples/59-one-command-indentation.out.ahk → ...amples/59-one-command-indentation.out.ahk b/...amples/59-one-command-indentation.out.ahk → ...amples/59-one-command-indentation.out.ahk
diff --git a/...mples/6-single-line-ends-with-newline.txt → ...mples/6-single-line-ends-with-newline.txt b/...mples/6-single-line-ends-with-newline.txt → ...mples/6-single-line-ends-with-newline.txt
diff --git a/...ting/samples/7-single-line-no-newline.txt → ...ders/samples/7-single-line-no-newline.txt b/...ting/samples/7-single-line-no-newline.txt → ...ders/samples/7-single-line-no-newline.txt
diff --git a/...ite/format/samples/72-paren-hotkey.in.ahk → src/providers/samples/72-paren-hotkey.in.ahk b/...ite/format/samples/72-paren-hotkey.in.ahk → src/providers/samples/72-paren-hotkey.in.ahk
diff --git a/...te/format/samples/72-paren-hotkey.out.ahk → ...providers/samples/72-paren-hotkey.out.ahk b/...te/format/samples/72-paren-hotkey.out.ahk → ...providers/samples/72-paren-hotkey.out.ahk
diff --git a/src/test/suite/format/samples/README.md → src/providers/samples/README.md b/src/test/suite/format/samples/README.md → src/providers/samples/README.md
diff --git a/.../suite/format/samples/ahk-explorer.in.ahk → src/providers/samples/ahk-explorer.in.ahk b/.../suite/format/samples/ahk-explorer.in.ahk → src/providers/samples/ahk-explorer.in.ahk
diff --git a/...suite/format/samples/ahk-explorer.out.ahk → src/providers/samples/ahk-explorer.out.ahk b/...suite/format/samples/ahk-explorer.out.ahk → src/providers/samples/ahk-explorer.out.ahk
diff --git a/...te/format/samples/align-assignment.in.ahk → ...providers/samples/align-assignment.in.ahk b/...te/format/samples/align-assignment.in.ahk → ...providers/samples/align-assignment.in.ahk
diff --git a/...e/format/samples/align-assignment.out.ahk → ...roviders/samples/align-assignment.out.ahk b/...e/format/samples/align-assignment.out.ahk → ...roviders/samples/align-assignment.out.ahk
diff --git a/src/test/suite/format/samples/demo.in.ahk → src/providers/samples/demo.in.ahk b/src/test/suite/format/samples/demo.in.ahk → src/providers/samples/demo.in.ahk
diff --git a/src/test/suite/format/samples/demo.out.ahk → src/providers/samples/demo.out.ahk b/src/test/suite/format/samples/demo.out.ahk → src/providers/samples/demo.out.ahk
diff --git a/...est/suite/format/samples/hotstring.in.ahk → src/providers/samples/hotstring.in.ahk b/...est/suite/format/samples/hotstring.in.ahk → src/providers/samples/hotstring.in.ahk
diff --git a/...st/suite/format/samples/hotstring.out.ahk → src/providers/samples/hotstring.out.ahk b/...st/suite/format/samples/hotstring.out.ahk → src/providers/samples/hotstring.out.ahk
diff --git a/...dent-code-after-if-directive-false.in.ahk → ...dent-code-after-if-directive-false.in.ahk b/...dent-code-after-if-directive-false.in.ahk → ...dent-code-after-if-directive-false.in.ahk
diff --git a/...ent-code-after-if-directive-false.out.ahk → ...ent-code-after-if-directive-false.out.ahk b/...ent-code-after-if-directive-false.out.ahk → ...ent-code-after-if-directive-false.out.ahk
diff --git a/...ndent-code-after-if-directive-true.in.ahk → ...ndent-code-after-if-directive-true.in.ahk b/...ndent-code-after-if-directive-true.in.ahk → ...ndent-code-after-if-directive-true.in.ahk
diff --git a/...dent-code-after-if-directive-true.out.ahk → ...dent-code-after-if-directive-true.out.ahk b/...dent-code-after-if-directive-true.out.ahk → ...dent-code-after-if-directive-true.out.ahk
diff --git a/...ples/indent-code-after-label-false.in.ahk → ...ples/indent-code-after-label-false.in.ahk b/...ples/indent-code-after-label-false.in.ahk → ...ples/indent-code-after-label-false.in.ahk
diff --git a/...les/indent-code-after-label-false.out.ahk → ...les/indent-code-after-label-false.out.ahk b/...les/indent-code-after-label-false.out.ahk → ...les/indent-code-after-label-false.out.ahk
diff --git a/...mples/indent-code-after-label-true.in.ahk → ...mples/indent-code-after-label-true.in.ahk b/...mples/indent-code-after-label-true.in.ahk → ...mples/indent-code-after-label-true.in.ahk
diff --git a/...ples/indent-code-after-label-true.out.ahk → ...ples/indent-code-after-label-true.out.ahk b/...ples/indent-code-after-label-true.out.ahk → ...ples/indent-code-after-label-true.out.ahk
diff --git a/...format/samples/insert-spaces-false.in.ahk → ...viders/samples/insert-spaces-false.in.ahk b/...format/samples/insert-spaces-false.in.ahk → ...viders/samples/insert-spaces-false.in.ahk
diff --git a/...ormat/samples/insert-spaces-false.out.ahk → ...iders/samples/insert-spaces-false.out.ahk b/...ormat/samples/insert-spaces-false.out.ahk → ...iders/samples/insert-spaces-false.out.ahk
diff --git a/...t/suite/format/samples/label-colon.in.ahk → src/providers/samples/label-colon.in.ahk b/...t/suite/format/samples/label-colon.in.ahk → src/providers/samples/label-colon.in.ahk
diff --git a/.../suite/format/samples/label-colon.out.ahk → src/providers/samples/label-colon.out.ahk b/.../suite/format/samples/label-colon.out.ahk → src/providers/samples/label-colon.out.ahk
diff --git a/...e/format/samples/label-combination.in.ahk → ...roviders/samples/label-combination.in.ahk b/...e/format/samples/label-combination.in.ahk → ...roviders/samples/label-combination.in.ahk
diff --git a/.../format/samples/label-combination.out.ahk → ...oviders/samples/label-combination.out.ahk b/.../format/samples/label-combination.out.ahk → ...oviders/samples/label-combination.out.ahk
diff --git a/.../format/samples/label-fall-through.in.ahk → ...oviders/samples/label-fall-through.in.ahk b/.../format/samples/label-fall-through.in.ahk → ...oviders/samples/label-fall-through.in.ahk
diff --git a/...format/samples/label-fall-through.out.ahk → ...viders/samples/label-fall-through.out.ahk b/...format/samples/label-fall-through.out.ahk → ...viders/samples/label-fall-through.out.ahk
diff --git a/...format/samples/label-specific-name.in.ahk → ...viders/samples/label-specific-name.in.ahk b/...format/samples/label-specific-name.in.ahk → ...viders/samples/label-specific-name.in.ahk
diff --git a/...ormat/samples/label-specific-name.out.ahk → ...iders/samples/label-specific-name.out.ahk b/...ormat/samples/label-specific-name.out.ahk → ...iders/samples/label-specific-name.out.ahk
diff --git a/...t/samples/legacy-text-if-directive.in.ahk → ...s/samples/legacy-text-if-directive.in.ahk b/...t/samples/legacy-text-if-directive.in.ahk → ...s/samples/legacy-text-if-directive.in.ahk
diff --git a/.../samples/legacy-text-if-directive.out.ahk → .../samples/legacy-text-if-directive.out.ahk b/.../samples/legacy-text-if-directive.out.ahk → .../samples/legacy-text-if-directive.out.ahk
diff --git a/...format/samples/return-exit-exitapp.in.ahk → ...viders/samples/return-exit-exitapp.in.ahk b/...format/samples/return-exit-exitapp.in.ahk → ...viders/samples/return-exit-exitapp.in.ahk
diff --git a/...ormat/samples/return-exit-exitapp.out.ahk → ...iders/samples/return-exit-exitapp.out.ahk b/...ormat/samples/return-exit-exitapp.out.ahk → ...iders/samples/return-exit-exitapp.out.ahk
diff --git a/...format/samples/single-line-comment.in.ahk → ...viders/samples/single-line-comment.in.ahk b/...format/samples/single-line-comment.in.ahk → ...viders/samples/single-line-comment.in.ahk
diff --git a/...ormat/samples/single-line-comment.out.ahk → ...iders/samples/single-line-comment.out.ahk b/...ormat/samples/single-line-comment.out.ahk → ...iders/samples/single-line-comment.out.ahk
diff --git a/...st/suite/format/samples/tab-size-2.in.ahk → src/providers/samples/tab-size-2.in.ahk b/...st/suite/format/samples/tab-size-2.in.ahk → src/providers/samples/tab-size-2.in.ahk
diff --git a/...t/suite/format/samples/tab-size-2.out.ahk → src/providers/samples/tab-size-2.out.ahk b/...t/suite/format/samples/tab-size-2.out.ahk → src/providers/samples/tab-size-2.out.ahk
diff --git a/src/test/suite/service/runnerService.test.ts → src/service/runnerService.test.ts b/src/test/suite/service/runnerService.test.ts → src/service/runnerService.test.ts
@@ -1,5 +1,5 @@
 import * as assert from 'assert';
-import { makeCompileCommand } from '../../../service/runnerService';
+import { makeCompileCommand } from './runnerService';
 
 suite('runnerService', () => {
     suite('makeCompileCommand', () => {

diff --git a/src/test/suite/grammar/samples/0-v2-demo.ahk2 b/src/test/suite/grammar/samples/0-v2-demo.ahk2
diff --git a/src/test/suite/grammar/samples/0-v2-demo.ahk2.snap b/src/test/suite/grammar/samples/0-v2-demo.ahk2.snap
diff --git a/src/test/suite/grammar/samples/295-command-comment.ahk1 b/src/test/suite/grammar/samples/295-command-comment.ahk1
diff --git a/src/test/suite/grammar/samples/295-command-comment.ahk1.snap b/src/test/suite/grammar/samples/295-command-comment.ahk1.snap
diff --git a/src/test/suite/grammar/samples/295-directive-comment.ahk1 b/src/test/suite/grammar/samples/295-directive-comment.ahk1
diff --git a/src/test/suite/grammar/samples/295-directive-comment.ahk1.snap b/src/test/suite/grammar/samples/295-directive-comment.ahk1.snap
diff --git a/src/test/suite/grammar/samples/295-function-call-comment.ahk1 b/src/test/suite/grammar/samples/295-function-call-comment.ahk1
diff --git a/src/test/suite/grammar/samples/295-function-call-comment.ahk1.snap b/src/test/suite/grammar/samples/295-function-call-comment.ahk1.snap
diff --git a/src/test/suite/grammar/samples/295-function-definition-comment.ahk1 b/src/test/suite/grammar/samples/295-function-definition-comment.ahk1
diff --git a/src/test/suite/grammar/samples/295-function-definition-comment.ahk1.snap b/src/test/suite/grammar/samples/295-function-definition-comment.ahk1.snap
diff --git a/src/test/suite/grammar/samples/295-label-comment.ahk1 b/src/test/suite/grammar/samples/295-label-comment.ahk1
diff --git a/src/test/suite/grammar/samples/295-label-comment.ahk1.snap b/src/test/suite/grammar/samples/295-label-comment.ahk1.snap
diff --git a/src/test/suite/grammar/samples/318-keyword-in-command.ahk1 b/src/test/suite/grammar/samples/318-keyword-in-command.ahk1