Fix block style none (#74)

.github/workflows/node.js.yml → .github/workflows/build.yml

@@ -29,4 +29,4 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
       - run: npm install
-      - run: npm run validate
+      - run: npm run validate:ci

client/src/test/formatting/array_object_style.out.ahk → client/src/test/formatting/block-style.out.ahk

@@ -1,7 +1,5 @@
 ;* No directive
-list := [{ name: 1, age: 2
-}, { name: 2, age: 3
-}]
+list := [{ name: 1, age: 2 }, { name: 2, age: 3 }]
 ;@format array_style: expand, object_style: expand
 list := [
     {

package.json

@@ -51,13 +51,16 @@
 		"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:unit && npm run test:e2e:ci",
 		"pretest:e2e": "npm run build:e2e",
 		"test:e2e": "vscode-test",
+		"test:e2e:ci": "npm run test:e2e -- --forbid-only",
 		"test:grammar": "vscode-tmgrammar-snap \"tmgrammar-test/*.ahk\"",
 		"pretest:unit": "npm run compile-ts",
 		"test:unit": "mocha",
 		"prevalidate": "npm run clean",
 		"validate": "npm run lint && npm run test && echo ✅ All checks passed",
+		"validate:ci": "npm run lint && npm run test:ci && echo ✅ All checks passed",
 		"prevalidate:fix": "npm run clean",
 		"validate:fix": "npm run lint:fix && npm run test && echo ✅ All checks passed",
 		"vscode:prepublish": "npm run validate",

server/src/lexer.ts

@@ -5509,7 +5509,7 @@ export class Lexer {
 				const style = flags.array_style ?? opt.array_style;
 				if (style === OBJECT_STYLE.collapse || last_text === '[' || flags.indentation_level >= previous_flags.indentation_level)
 					trim_newlines();
-				else if (style || input_wanted_newline && opt.preserve_newlines)
+				else if (style !== 'none' || input_wanted_newline && opt.preserve_newlines)
 					print_newline(true);
 			} else if ((last_type === 'TK_END_EXPR' || last_type === 'TK_END_BLOCK') && flags.indentation_level >= previous_flags.indentation_level)
 				trim_newlines();
@@ -5576,7 +5576,7 @@ export class Lexer {
 				const style = flags.object_style ?? opt.object_style;
 				if (style === OBJECT_STYLE.collapse || last_text === '{')
 					trim_newlines();
-				else if (style || input_wanted_newline && opt.preserve_newlines)
+				else if (style !== 'none' || input_wanted_newline && opt.preserve_newlines)
 					print_newline(true);
 				output_space_before_token = space_in_other && last_text !== '{';
 			} else if (opt.brace_style !== 'Preserve' || input_wanted_newline)