chore: consolidate code style config and reformat source code

SchweizerischeBundesbahnen · Aug 7, 2023 · e9d88dd · e9d88dd
1 parent ea6c043
commit e9d88dd
Show file tree

Hide file tree

Showing 6 changed files with 588 additions and 709 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.editorconfig.intellij.xml b/.editorconfig.intellij.xml
@@ -2,32 +2,60 @@
   <option name="OTHER_INDENT_OPTIONS">
     <value>
       <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
     </value>
   </option>
-  <option name="LINE_SEPARATOR" value="&#xA;" />
+  <option name="LINE_SEPARATOR" value="&#10;" />
   <option name="RIGHT_MARGIN" value="999" />
+  <HTMLCodeStyleSettings>
+    <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" />
+  </HTMLCodeStyleSettings>
   <JSCodeStyleSettings version="0">
     <option name="USE_DOUBLE_QUOTES" value="false" />
     <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
     <option name="INDENT_CHAINED_CALLS" value="false" />
+    <option name="SPACES_WITHIN_OBJECT_TYPE_BRACES" value="false" />
   </JSCodeStyleSettings>
+  <JavaCodeStyleSettings>
+    <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="" withSubpackages="true" static="true" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+      </value>
+    </option>
+    <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+    <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+    <option name="JD_P_AT_EMPTY_LINES" value="false" />
+    <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+    <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+    <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+  </JavaCodeStyleSettings>
   <TypeScriptCodeStyleSettings version="0">
+    <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
     <option name="USE_PUBLIC_MODIFIER" value="true" />
     <option name="USE_DOUBLE_QUOTES" value="false" />
     <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
     <option name="IMPORTS_WRAP" value="0" />
-    <option name="SPACES_WITHIN_IMPORTS" value="false" />
+    <option name="SPACES_WITHIN_OBJECT_TYPE_BRACES" value="false" />
   </TypeScriptCodeStyleSettings>
   <XML>
     <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
   </XML>
+  <editorconfig>
+    <option name="ENABLED" value="false" />
+  </editorconfig>
   <codeStyleSettings language="CSS">
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
@@ -52,20 +80,47 @@
   <codeStyleSettings language="HTML">
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
-  <codeStyleSettings language="JSON">
+  <codeStyleSettings language="JAVA">
+    <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+    <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="CATCH_ON_NEW_LINE" value="true" />
+    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
+    <option name="ALIGN_MULTILINE_FOR" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="THROWS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="TERNARY_OPERATION_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+    <option name="WRAP_COMMENTS" value="true" />
+    <option name="IF_BRACE_FORCE" value="3" />
+    <option name="DOWHILE_BRACE_FORCE" value="3" />
+    <option name="WHILE_BRACE_FORCE" value="3" />
+    <option name="FOR_BRACE_FORCE" value="3" />
     <indentOptions>
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JavaScript">
-    <option name="RIGHT_MARGIN" value="999" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="WHILE_ON_NEW_LINE" value="true" />
+    <option name="CATCH_ON_NEW_LINE" value="true" />
     <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
@@ -82,18 +137,13 @@
     <option name="FOR_BRACE_FORCE" value="3" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
-      <option name="TAB_SIZE" value="2" />
-    </indentOptions>
-  </codeStyleSettings>
-  <codeStyleSettings language="SASS">
-    <indentOptions>
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="SCSS">
     <indentOptions>
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
@@ -431,4 +481,4 @@
       </rules>
     </arrangement>
   </codeStyleSettings>
-</code_scheme>
+</code_scheme>
diff --git a/apps/components-testing-app/src/index.html b/apps/components-testing-app/src/index.html
@@ -1,12 +1,12 @@
 <!doctype html>
 <html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>SCION Components Testing App</title>
-  <base href="/">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-</head>
-<body>
-  <app-root></app-root>
-</body>
+  <head>
+    <meta charset="utf-8">
+    <title>SCION Components Testing App</title>
+    <base href="/">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <app-root></app-root>
+  </body>
 </html>
diff --git a/projects/scion/components.e2e/src/console-logs.ts b/projects/scion/components.e2e/src/console-logs.ts
@@ -22,7 +22,7 @@ export class ConsoleLogs {
     this._page.on('console', this.onConsole);
   }
 
-  public async get(options?: { severity?: Severity; filter?: RegExp; consume?: boolean; probeInterval?: number }): Promise<string[]> {
+  public async get(options?: {severity?: Severity; filter?: RegExp; consume?: boolean; probeInterval?: number}): Promise<string[]> {
     // Wait for log messages to become stable since received asynchronously.
     const messages = await firstValueFrom(this._messages$.pipe(debounceTime(options?.probeInterval ?? 500)));
 

diff --git a/projects/scion/components.e2e/tsconfig.json b/projects/scion/components.e2e/tsconfig.json
@@ -10,6 +10,6 @@
     "target": "es2020",
     "types": [
       "node"
-    ],
+    ]
   }
 }
diff --git a/projects/scion/components.internal/theming/_color-palettes.scss b/projects/scion/components.internal/theming/_color-palettes.scss
@@ -12,51 +12,51 @@
  * Background:  Used for element backgrounds.
  */
 $default: (
-    primary: (
-        50: #fafafa,
-        100: #f5f5f5,
-        200: #eeeeee,
-        300: #e0e0e0,
-        400: #bdbdbd,
-        500: #9f9f9f,
-        600: #757575,
-        700: #616161,
-        800: #424242,
-        900: #212121,
-        default: 500,
-        lighter: 400,
-        darker: 600,
-    ),
-    accent: (
-        50: #D3E3FE,
-        100: #A7C6FD,
-        200: #7BAAFC,
-        300: #4E8EFA,
-        400: #2271F9,
-        500: #0659E8,
-        600: #0548BC,
-        700: #04378F,
-        800: #03307E,
-        900: #03296C,
-        default: 700,
-        lighter: 400,
-        darker: 900,
-    ),
-    warn: (
-        50: #ffebee,
-        100: #ffcdd2,
-        200: #ef9a9a,
-        300: #e57373,
-        400: #ef5350,
-        500: #f44336,
-        600: #e53935,
-        700: #d32f2f,
-        800: #c62828,
-        900: #b71c1c,
-        default: 600,
-        lighter: 500,
-        darker: 700,
-    ),
-    foreground: #000000,
-    background: #FFFFFF,
+  primary: (
+    50: #fafafa,
+    100: #f5f5f5,
+    200: #eeeeee,
+    300: #e0e0e0,
+    400: #bdbdbd,
+    500: #9f9f9f,
+    600: #757575,
+    700: #616161,
+    800: #424242,
+    900: #212121,
+    default: 500,
+    lighter: 400,
+    darker: 600,
+  ),
+  accent: (
+    50: #D3E3FE,
+    100: #A7C6FD,
+    200: #7BAAFC,
+    300: #4E8EFA,
+    400: #2271F9,
+    500: #0659E8,
+    600: #0548BC,
+    700: #04378F,
+    800: #03307E,
+    900: #03296C,
+    default: 700,
+    lighter: 400,
+    darker: 900,
+  ),
+  warn: (
+    50: #ffebee,
+    100: #ffcdd2,
+    200: #ef9a9a,
+    300: #e57373,
+    400: #ef5350,
+    500: #f44336,
+    600: #e53935,
+    700: #d32f2f,
+    800: #c62828,
+    900: #b71c1c,
+    default: 600,
+    lighter: 500,
+    darker: 700,
+  ),
+  foreground: #000000,
+  background: #FFFFFF,
 );
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,6 @@ @@
         "target": "es2020",
         "types": [
           "node"
-        ],
+        ]
       }
     }