Test against more specs

Author: domdfcoding

python/formate_js/__init__.py

@@ -68,7 +68,9 @@ def javascript_hook(
 		if "indent" in (formate_global_config or {}):
 			indent_setting = formate_global_config["indent"]
 			if indent_setting == '\t':
-				kwargs["use_tabs"] = True
+				if "indent_width" not in kwargs:
+					kwargs["use_tabs"] = True
+					kwargs["indent_width"] = 4
 			else:
 				kwargs["use_tabs"] = False
 				if set(indent_setting) == {' '}:

src/configuration.rs

@@ -973,6 +973,7 @@ const USE_BRACES_DEFAULT: &str = "whenNotSingleLine";
 const PREFER_HANGING_DEFAULT: bool = false;
 const PREFER_HANGING_GRANULAR_DEFAULT: &str = "never";
 const PREFER_SINGLE_LINE_DEFAULT: bool = false;
+const METHOD_SPACE_BEFORE_PARENTHESES_DEFAULT: bool = false;
 const SPACE_SURROUNDING_PROPERTIES_DEFAULT: bool = true;
 const TYPE_LITERAL_SEPARATOR_KIND_DEFAULT: &str = "semiColon";
 const QUOTE_STYLE_DEFAULT: &str = "alwaysDouble";
@@ -1180,7 +1181,7 @@ impl PyConfiguration {
 		import_declaration_space_surrounding_named_imports: "bool" = IMPORT_DECLARATION_SPACE_SURROUNDING_NAMED_IMPORTS_DEFAULT,
 		jsx_expression_container_space_surrounding_expression: "bool" = JSX_EXPRESSION_CONTAINER_SPACE_SURROUNDING_EXPRESSION_DEFAULT,
 		jsx_self_closing_element_space_before_slash: "bool" = JSX_SELF_CLOSING_ELEMENT_SPACE_BEFORE_SLASH_DEFAULT,
-		method_space_before_parentheses: "bool" = SPACE_SURROUNDING_PROPERTIES_DEFAULT,
+		method_space_before_parentheses: "bool" = METHOD_SPACE_BEFORE_PARENTHESES_DEFAULT,
 		object_expression_space_surrounding_properties: "bool" = SPACE_SURROUNDING_PROPERTIES_DEFAULT,
 		object_pattern_space_surrounding_properties: "bool" = SPACE_SURROUNDING_PROPERTIES_DEFAULT,
 		set_accessor_space_before_parentheses: "bool" = SET_ACCESSOR_SPACE_BEFORE_PARENTHESES_DEFAULT,
@@ -2320,7 +2321,7 @@ impl PyConfiguration {
 		dict_set_item!(
 			"method_space_before_parentheses",
 			self.method_space_before_parentheses,
-			SPACE_SURROUNDING_PROPERTIES_DEFAULT
+			METHOD_SPACE_BEFORE_PARENTHESES_DEFAULT
 		);
 		dict_set_item!(
 			"object_expression_space_surrounding_properties",

tests/requirements.txt

@@ -5,3 +5,4 @@ pytest>=6.0.0
 pytest-cov>=2.8.1
 pytest-randomly>=3.7.0
 pytest-timeout>=1.4.2
+regex>=2024.11.6

tests/specs/clauses/catchClause/CatchClause_SpaceAround_True.txt

@@ -0,0 +1,42 @@
+~~ catchClause.spaceAround: true ~~
+== should output without param ==
+try{
+    a;
+} catch
+{
+    b;
+}
+
+[expect]
+try {
+    a;
+} catch {
+    b;
+}
+
+== should output with param ==
+try{
+    a;
+}
+catch(ex){
+    b;
+}
+
+[expect]
+try {
+    a;
+} catch ( ex ) {
+    b;
+}
+
+== should output with type on param ==
+try {
+    a
+} catch (  ex    :unknown ) {
+}
+
+[expect]
+try {
+    a;
+} catch ( ex: unknown ) {
+}

tests/specs/comments/CommentLines_ForceSpaceAfterDoubleSlash_False.txt

@@ -0,0 +1,10 @@
+~~ commentLine.forceSpaceAfterSlashes: false ~~
+== should not force a space after a double slash ==
+//test
+// test
+//  test
+
+[expect]
+//test
+// test
+//  test

tests/specs/comments/IgnoreComments_Custom.txt

@@ -0,0 +1,70 @@
+~~ ignoreNodeCommentText: my-ignore-comment, ignoreFileCommentText: my-ignore-file-comment ~~
+== should ignore formatting a node marked with a custom ignore comment ==
+// my-ignore-comment
+call(5, 6, 7,
+    8, 9, 10);
+
+[expect]
+// my-ignore-comment
+call(5, 6, 7,
+    8, 9, 10);
+
+== should not ignore when a comment block ==
+/* my-ignore-comment */
+[
+    5, 6, 7,
+    8, 9, 10,
+    11, 12, 13
+];
+
+[expect]
+/* my-ignore-comment */
+[
+    5, 6, 7,
+    8, 9, 10,
+    11, 12, 13
+];
+
+== should not ignore when ignore word has extra characters on the end ==
+/* my-ignore-commente */
+[
+    5, 6, 7
+]
+
+[expect]
+/* my-ignore-commente */
+[
+    5,
+    6,
+    7,
+];
+
+== should ignore when there is a colon after (or some other non word character) ==
+/* my-ignore-comment: Some explanation */
+[
+    5, 6, 7
+]
+
+[expect]
+/* my-ignore-comment: Some explanation */
+[
+    5, 6, 7
+]
+
+== should ignore a custom file ignore comment ==
+// my-ignore-file-comment
+// test
+[
+    5, 6
+];
+[1,
+9]
+
+[expect]
+// my-ignore-file-comment
+// test
+[
+    5, 6
+];
+[1,
+9]

tests/specs/comments/IgnoreComments_Jsx.txt

@@ -0,0 +1,50 @@
+-- file.tsx --
+== should ignore element after ignore comment in an element ==
+const t = (
+    <Element>
+        {/* dprint-ignore */}
+        <Test      />
+    </Element>
+);
+
+[expect]
+const t = (
+    <Element>
+        {/* dprint-ignore */}
+        <Test      />
+    </Element>
+);
+
+== should ignore element after ignore comment in a fragment ==
+const t = (
+    <>
+        {/* dprint-ignore */}
+        <Test      />
+    </>
+);
+
+[expect]
+const t = (
+    <>
+        {/* dprint-ignore */}
+        <Test      />
+    </>
+);
+
+== should ignore element after ignore comment in a previous empty element ==
+const t = (
+    <Element>
+        {/* dprint-ignore */}
+        {/* deno-lint-ignore */}
+        <Test      />
+    </Element>
+);
+
+[expect]
+const t = (
+    <Element>
+        {/* dprint-ignore */}
+        {/* deno-lint-ignore */}
+        <Test      />
+    </Element>
+);

tests/specs/common/DeclarationFile_All.txt

@@ -0,0 +1,44 @@
+-- file.d.ts --
+== should format a declaration file ==
+declare namespace someModule {
+    interface Test {
+        prop: string;
+    }
+}
+
+declare module "test" {
+    class Test {
+        myMethod(): void;
+    }
+}
+
+global {
+    interface GlobalTest {
+        prop: number;
+    }
+}
+
+declare function someFunc(): string;
+export = someFunc;
+
+[expect]
+declare namespace someModule {
+    interface Test {
+        prop: string;
+    }
+}
+
+declare module "test" {
+    class Test {
+        myMethod(): void;
+    }
+}
+
+global {
+    interface GlobalTest {
+        prop: number;
+    }
+}
+
+declare function someFunc(): string;
+export = someFunc;

tests/specs/common/configuration/IllegalTrailingCommas.txt

@@ -0,0 +1,84 @@
+~~ trailingCommas: always, lineWidth: 40 ~~
+== should not do a trailing comma in rest parameters ==
+function foo(
+    a: A,
+    b: B,
+    ...c: C
+): void {}
+
+[expect]
+function foo(
+    a: A,
+    b: B,
+    ...c: C
+): void {}
+
+== should not do a trailing comma in array patterns ==
+const [a, b] = [1, 2, 3];
+const [a, ...b] = [1, 2, 3];
+
+[expect]
+const [a, b,] = [1, 2, 3,];
+const [a, ...b] = [1, 2, 3,];
+
+== should not do a trailing comma in object patterns ==
+const { a, b } = {};
+const { a, ...b } = {};
+
+[expect]
+const { a, b, } = {};
+const { a, ...b } = {};
+
+== should not use trailing commas on a dynamic import ==
+const ttttesssttt = import("testttttttt");
+
+[expect]
+const ttttesssttt = import(
+    "testttttttt"
+);
+
+== should not use trailing commas in a rest param in arrow functions ==
+const test = (
+    a: A,
+    b: B,
+    ...c: C
+): void => {
+    test;
+};
+
+[expect]
+const test = (
+    a: A,
+    b: B,
+    ...c: C
+): void => {
+    test;
+};
+
+== should not use trailing comma in type argument in class decl ==
+export class DocumentCollection<
+    T extends object = any,
+> extends BaseCollection<
+    T
+> {}
+
+[expect]
+export class DocumentCollection<
+    T extends object = any,
+> extends BaseCollection<
+    T
+> {}
+
+== should not use trailing comma in type argument in class expr ==
+const t = class DocumentCollection<
+    T extends object = any,
+> extends BaseCollection<
+    T
+> {}
+
+[expect]
+const t = class DocumentCollection<
+    T extends object = any,
+> extends BaseCollection<
+    T
+> {};

tests/specs/common/configuration/UseTabs_IndentWidth.txt

@@ -0,0 +1,8 @@
+~~ useTabs: true, indentWidth: 4, lineWidth: 40 ~~
+== should use the specified indent width for the tab size ==
+const test = testingThisOutt + testtt + testingThisOut + testingthi + outt;
+
+[expect]
+const test = testingThisOutt + testtt
+	+ testingThisOut + testingthi
+	+ outt;