Merge pull request #9 from NordicPlayground/linter

Format with prettier and enable linting on CI

Author: michaeljones

.prettierignore

@@ -0,0 +1,8 @@
+/out
+/.vscode
+
+*.md
+*.yml
+
+package.json
+package-lock.json

azure-pipelines.yml

@@ -11,18 +11,22 @@ steps:
   inputs:
     versionSpec: 14
   displayName: Install Node.js
+
 - script: |
     set -o errexit -o pipefail
     npm ci
   displayName: Install dependencies
+
 - script: |
     set -o errexit -o pipefail
-    echo "npm run lint" is skipped for now
+    npm run lint
   displayName: Run linter
+
 - script: |
     set -o errexit -o pipefail
     npm run copyright check
   displayName: Check copyright statements
+
 - bash: |
     set -o errexit -o pipefail
     npm install -g vsce
@@ -31,6 +35,7 @@ steps:
     pkg=$(ls *.vsix)
     mv -v ${pkg} "$(Build.ArtifactStagingDirectory)/${pkg}"
   displayName: Pack and build extension
+
 - task: PublishPipelineArtifact@1
   inputs:
     targetPath: $(Build.ArtifactStagingDirectory)

language-configuration.json

@@ -10,38 +10,15 @@
     },
     "wordPattern": "[a-zA-Z0-9_\\-]+",
     "surroundingPairs": [
-        [
-            "(",
-            ")"
-        ],
-        [
-            "\"",
-            "\""
-        ],
-        [
-            "{",
-            "}"
-        ]
-    ],
-    "brackets": [
-        [
-            "(",
-            ")"
-        ]
+        ["(", ")"],
+        ["\"", "\""],
+        ["{", "}"]
     ],
+    "brackets": [["(", ")"]],
     "autoClosingPairs": [
-        [
-            "(",
-            ")"
-        ],
-        [
-            "\"",
-            "\""
-        ],
-        [
-            "{",
-            "}"
-        ]
+        ["(", ")"],
+        ["\"", "\""],
+        ["{", "}"]
     ],
     "autoCloseBefore": ";:.,=}])>\n\t"
 }

scripts/lint.js

@@ -14,7 +14,7 @@ function spawnInPromise(command, argv) {
             env: process.env,
             shell: true,
             stdio: 'inherit',
-        }).on('exit', (code) => (code !== 0) ? reject(code) : resolve());
+        }).on('exit', (code) => (code !== 0 ? reject(code) : resolve()));
     });
 }
 
@@ -33,8 +33,7 @@ function runESLint() {
 function runPrettier() {
     const prettier = path.join('node_modules', '.bin', 'prettier');
     const configFile = `"${require.resolve('../.prettierrc.js')}"`;
-    const patterns = ['src/**/*.ts'];
-    const args = [shouldFix ? '--write' : '--check', ...patterns.map(p => `"${p}"`), '--config', configFile];
+    const args = [shouldFix ? '--write' : '--check', '--config', configFile, '.'];
     return spawnInPromise(prettier, args);
 }
 

scripts/updateBuildNumber.js

@@ -7,8 +7,13 @@ const pkgJson = require('../package.json');
 const { resolve } = require('path');
 
 require('fs').writeFileSync(
-    resolve(__dirname, '../package.json'), JSON.stringify({
-        ...pkgJson,
-        version: `${process.argv[2]}`
-    }, null, 2)
+    resolve(__dirname, '../package.json'),
+    JSON.stringify(
+        {
+            ...pkgJson,
+            version: `${process.argv[2]}`,
+        },
+        null,
+        2
+    )
 );

src/api.ts

@@ -16,15 +16,19 @@ interface Config {
         path?: vscode.Uri;
     };
     /** Configuration files used, in addition to the board's conf file */
-    confFiles?: vscode.Uri[],
+    confFiles?: vscode.Uri[];
     /** Root Kconfig file, or leave undefined to fall back to $ZEPHYR_ROOT/Kconfig. */
     kconfigRoot?: vscode.Uri;
 }
 
 class Api {
     public version = 2;
 
-    async activate(zephyrBase: vscode.Uri, west: string, env?: typeof process.env): Promise<boolean> {
+    async activate(
+        zephyrBase: vscode.Uri,
+        west: string,
+        env?: typeof process.env
+    ): Promise<boolean> {
         await zephyr.setWest(west, env);
         await zephyr.setZephyrBase(zephyrBase);
         return startExtension();

src/context.ts

@@ -12,16 +12,23 @@ import { PropFile } from './propfile';
  */
 export class Context {
     confFiles: PropFile[];
-    constructor(confFiles: vscode.Uri[], public repo: Repository, diags: vscode.DiagnosticCollection) {
-        this.confFiles = confFiles.map(uri => new PropFile(uri, this, diags));
+    constructor(
+        confFiles: vscode.Uri[],
+        public repo: Repository,
+        diags: vscode.DiagnosticCollection
+    ) {
+        this.confFiles = confFiles.map((uri) => new PropFile(uri, this, diags));
     }
 
     get overrides(): ConfigOverride[] {
-        return this.confFiles.reduce((overrides, c) => overrides.concat(c.overrides), new Array<ConfigOverride>());
+        return this.confFiles.reduce(
+            (overrides, c) => overrides.concat(c.overrides),
+            new Array<ConfigOverride>()
+        );
     }
 
     getFile(uri: vscode.Uri): PropFile | undefined {
-        return this.confFiles.find(c => c.uri.fsPath === uri.fsPath);
+        return this.confFiles.find((c) => c.uri.fsPath === uri.fsPath);
     }
 
     onChangedEditor(e?: vscode.TextEditor) {
@@ -35,6 +42,6 @@ export class Context {
     }
 
     reparse() {
-        return Promise.all(this.confFiles.map(c => c.parse()));
+        return Promise.all(this.confFiles.map((c) => c.parse()));
     }
 }