Fix block style v2 formatting (#552)

changelog.md

@@ -15,9 +15,10 @@
 
 ### Fixes
 
+-   Fix v1 formatter removing extra spaces in strings ([#411](https://github.com/mark-wiemer-org/ahkpp/issues/411))
+-   Fix v2 formatter moving closing brackets/braces when `arrayStyle` or `objectStyle` were set to "none" (the default) ([#499](https://github.com/mark-wiemer-org/ahkpp/issues/499))
 -   Fixup output channel names: "AHK++ (v1)" and "AHK++ (v2)" instead of "AHK" and "AHK++" respectively
--   Fix duplicate output channels
--   Fix formatter removing extra spaces in v1 strings ([#411](https://github.com/mark-wiemer-org/ahkpp/issues/411))
+-   Fix duplicate output channels (the "AHK" channel used to be created twice)
 
 ### Other
 

package.json

@@ -71,14 +71,15 @@
         "sort-package-json": "sort-package-json --check",
         "sort-package-json:fix": "sort-package-json",
         "test": "npm run test:grammar && npm run test:unit && npm run test:e2e",
-        "test:ci": "npm run test:grammar && npm run test:e2e:ci",
+        "test:ci": "npm run test:grammar && npm run test:unit:ci && npm run test:e2e:ci",
         "pretest:e2e": "npm run build && npm run compile:ts",
         "test:e2e": "vscode-test",
-        "test:e2e:ci": "npm run test:e2e -- -i --fgrep @ignoreCI",
+        "test:e2e:ci": "npm run test:e2e -- -i --fgrep @ignoreCI --forbid-only",
         "pretest:grammar": "npm run compile:grammar",
         "test:grammar": "vscode-tmgrammar-snap language/samples/*.{ahk1,ahk2}",
         "pretest:unit": "npm run compile:ts",
         "test:unit": "mocha",
+        "test:unit:ci": "npm run test:unit -- --forbid-only",
         "validate": "npm run lint && npm run test && npm run package",
         "validate:ci": "npm run lint && npm run test:ci && npm run package",
         "validate:deep": "cd ahk2 && npm run validate && cd .. && npm run validate",
@@ -1158,7 +1159,6 @@
     "devDependencies": {
         "@eslint/js": "^9.9.0",
         "@types/eslint__js": "^8.42.3",
-        "@types/fs-extra": "^9.0.7",
         "@types/glob": "^7.1.3",
         "@types/mocha": "^10.0.8",
         "@types/node": "^20.16.0",
@@ -1171,7 +1171,6 @@
         "del-cli": "^6.0.0",
         "esbuild": "0.24.0",
         "eslint": "^9.9.0",
-        "fs-extra": "^9.1.0",
         "glob": "^7.1.6",
         "js-yaml": "^4.1.0",
         "mocha": "^10.0.0",

src/providers/formattingProvider.e2e.ts

@@ -1,6 +1,6 @@
 import { getDocument, showDocument } from '../test/utils';
 import * as assert from 'assert';
-import * as fs from 'fs-extra';
+import * as fs from 'fs';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import { FormatProvider } from './formattingProvider';

src/providers/formattingProvider.utils.test.ts

@@ -19,7 +19,7 @@ import {
     removeEmptyLines,
     trimExtraSpaces,
 } from './formattingProvider.utils';
-import * as fs from 'fs-extra';
+import * as fs from 'fs';
 import * as path from 'path';
 import { FormatOptions } from './formattingProvider.types';
 
@@ -1049,7 +1049,7 @@ interface FormatTest {
     options?: Partial<FormatOptions>;
 }
 
-suite.only('internalFormat', () => {
+suite('internalFormat', () => {
     // Currently in `out` folder, need to get back to main `src` folder
     const filesParentPath = path.join(
         __dirname, // ./out/src/providers
@@ -1064,8 +1064,8 @@ suite.only('internalFormat', () => {
     const inFilenameSuffix = '.in.ahk';
     const outFilenameSuffix = '.out.ahk';
 
-    const fileToString = (path: string): string =>
-        fs.readFileSync(path).toString();
+    const fileToString = (filePath: string): string =>
+        fs.readFileSync(filePath).toString();
 
     /** Default formatting options, meant to match default extension settings */
     const defaultOptions = {

src/test/config.e2e.ts

@@ -85,11 +85,13 @@ suite('exclude', () => {
 
     tests.forEach(([name, version, exclude, expected]) => {
         test(name, async () => {
-            if (version === 1)
+            if (version === 1) {
                 await updateConfig<string[]>(ConfigKey.exclude, exclude);
+            }
             const filePath = resolve(rootPath, `./e2e/main.ahk${version}`);
             const doc = await getDocument(filePath);
             const editor = await showDocument(doc);
+            await sleep(1_000); // todo only these tests are extra flaky
             await addAndSelectSnippet(editor, snippetText);
 
             const labels = await getCompletionSuggestionLabels(editor);
@@ -99,14 +101,14 @@ suite('exclude', () => {
     });
 });
 
-suite.only('v2.general.librarySuggestions', () => {
+suite('v2.general.librarySuggestions', () => {
     let editor: vscode.TextEditor;
     before(async () => {
         await updateConfig<string[]>(ConfigKey.exclude, []);
         const filePath = resolve(rootPath, './e2e/main.ahk2');
         const doc = await getDocument(filePath);
         editor = await showDocument(doc);
-        await sleep(1000);
+        await sleep(1_000);
     });
 
     const tests: [name: string, libType: LibIncludeType, expected: boolean][] =

src/test/utils.ts

@@ -47,7 +47,7 @@ export const updateConfig = async <T>(
     await vscode.workspace
         .getConfiguration(configPrefix)
         .update(section, value, false);
-    await sleep(1500); // todo tests are flaky even at 1_000ms
+    await sleep(1_500); // todo tests are flaky even at 1_000ms
 };
 
 /**