style: update configs

sourcegraph · Nov 14, 2017 · f1542d0 · f1542d0
1 parent c4fc53e
commit f1542d0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+package.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -28,6 +28,13 @@
       "problemMatcher": [
         "$tslint5"
       ]
+    },
+    {
+      "type": "npm",
+      "script": "tslint",
+      "problemMatcher": [
+        "$tslint5"
+      ]
     }
   ]
 }
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
   "devDependencies": {
     "@sourcegraph/prettierrc": "^1.1.0",
     "@sourcegraph/tsconfig": "^1.0.0",
-    "@sourcegraph/tslint-config": "^7.0.0",
+    "@sourcegraph/tslint-config": "^8.0.0",
     "@types/chai": "^4.0.0",
     "@types/chai-as-promised": "^7.1.0",
     "@types/glob": "^5.0.30",
@@ -76,7 +76,7 @@
     "husky": "^0.14.0",
     "mocha": "^4.0.0",
     "nyc": "^11.0.2",
-    "prettier": "1.7.4",
+    "prettier": "1.8.2",
     "rimraf": "^2.6.1",
     "semantic-release": "^8.0.0",
     "sinon": "^4.0.0",

diff --git a/src/server.ts b/src/server.ts
@@ -47,8 +47,9 @@ export function serve(
         })
         cluster.on('exit', (worker, code, signal) => {
             logger.error(
-                `Worker ${worker.id} (PID ${worker.process
-                    .pid}) exited from signal ${signal} with code ${code}, restarting`
+                `Worker ${worker.id} (PID ${worker.process.pid}) exited from signal ${signal} with code ${
+                    code
+                }, restarting`
             )
             cluster.fork()
         })

diff --git a/src/typescript-service.ts b/src/typescript-service.ts
@@ -1000,8 +1000,9 @@ export class TypeScriptService {
                                         // Continue with next node on error
                                         // Workaround for https://github.com/Microsoft/TypeScript/issues/15219
                                         this.logger.error(
-                                            `workspace/xreferences: Error getting definition for ${source.fileName} at offset ${node.pos +
-                                                1}`,
+                                            `workspace/xreferences: Error getting definition for ${
+                                                source.fileName
+                                            } at offset ${node.pos + 1}`,
                                             err
                                         )
                                         span.log({
@@ -1688,9 +1689,9 @@ export class TypeScriptService {
                         .mergeMap(sourceFile => {
                             try {
                                 const tree = service.getNavigationTree(sourceFile.fileName)
-                                const nodes = observableFromIterable(
-                                    walkNavigationTree(tree)
-                                ).filter(({ tree, parent }) => navigationTreeIsSymbol(tree))
+                                const nodes = observableFromIterable(walkNavigationTree(tree)).filter(
+                                    ({ tree, parent }) => navigationTreeIsSymbol(tree)
+                                )
                                 let matchedNodes: Observable<{
                                     score: number
                                     tree: ts.NavigationTree

diff --git a/tslint.json b/tslint.json
@@ -1,11 +1,9 @@
 {
   "extends": "@sourcegraph/tslint-config",
   "rules": {
-
     "rxjs-add": false,
     "rxjs-no-add": true,
     "rxjs-no-wholesale": false,
-
     "no-console": [true, "log", "info", "warn", "error", "trace", "time", "timeEnd", "assert", "count", "dir", "table"]
   }
 }