build: fix tslint

Author: felixfbecker

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
-node_js: "10"
+node_js: '10'
 cache: yarn
 env:
   global:
@@ -13,7 +13,7 @@ jobs:
         - npm run build
         - npm run cover
         - nyc report --reporter json
-        - "bash <(curl -s https://codecov.io/bash)"
+        - 'bash <(curl -s https://codecov.io/bash)'
 stages:
   - test
 branches:

package.json

@@ -119,7 +119,8 @@
   },
   "dependencies": {
     "date-fns": "^2.0.0-alpha.24",
-    "rxjs": "^6.4.0"
+    "rxjs": "^6.4.0",
+    "tagged-template-noop": "^2.1.0"
   },
   "husky": {
     "hooks": {

src/blame.ts

@@ -1,5 +1,6 @@
 import formatDistanceStrict from 'date-fns/formatDistanceStrict'
 import * as sourcegraph from 'sourcegraph'
+import gql from 'tagged-template-noop'
 import { Settings } from './extension'
 import { resolveURI } from './uri'
 import { memoizeAsync } from './util/memoizeAsync'
@@ -54,6 +55,49 @@ const getBlameDecorationsForSelections = (hunks: Hunk[], selections: sourcegraph
 const getAllBlameDecorations = (hunks: Hunk[], now: number) =>
     hunks.map(hunk => getDecorationFromHunk(hunk, now, hunk.startLine - 1))
 
+const queryBlameHunks = memoizeAsync(
+    async (uri: string): Promise<Hunk[]> => {
+        const { repo, rev, path } = resolveURI(uri)
+        const { data, errors } = await sourcegraph.commands.executeCommand(
+            'queryGraphQL',
+            gql`
+                query GitBlame($repo: String!, $rev: String!, $path: String!) {
+                    repository(name: $repo) {
+                        commit(rev: $rev) {
+                            blob(path: $path) {
+                                blame(startLine: 0, endLine: 0) {
+                                    startLine
+                                    endLine
+                                    author {
+                                        person {
+                                            displayName
+                                        }
+                                        date
+                                    }
+                                    message
+                                    rev
+                                    commit {
+                                        url
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            `,
+            { repo, rev, path }
+        )
+        if (errors && errors.length > 0) {
+            throw new Error(errors.join('\n'))
+        }
+        if (!data || !data.repository || !data.repository.commit || !data.repository.commit.blob) {
+            throw new Error('no blame data is available (repository, commit, or path not found)')
+        }
+        return data.repository.commit.blob.blame
+    },
+    uri => uri
+)
+
 /**
  * Queries the blame hunks for the document at the provided URI,
  * and returns blame decorations for all provided selections,
@@ -97,49 +141,6 @@ interface Hunk {
     }
 }
 
-const queryBlameHunks = memoizeAsync(
-    async (uri: string): Promise<Hunk[]> => {
-        const { repo, rev, path } = resolveURI(uri)
-        const { data, errors } = await sourcegraph.commands.executeCommand(
-            'queryGraphQL',
-            `
-query GitBlame($repo: String!, $rev: String!, $path: String!) {
-	repository(name: $repo) {
-		commit(rev: $rev) {
-			blob(path: $path) {
-				blame(startLine: 0, endLine: 0) {
-					startLine
-					endLine
-					author {
-						person {
-							displayName
-						}
-						date
-					}
-					message
-					rev
-					commit {
-						url
-					}
-				}
-			}
-		}
-	}
-}
-	`,
-            { repo, rev, path }
-        )
-        if (errors && errors.length > 0) {
-            throw new Error(errors.join('\n'))
-        }
-        if (!data || !data.repository || !data.repository.commit || !data.repository.commit.blob) {
-            throw new Error('no blame data is available (repository, commit, or path not found)')
-        }
-        return data.repository.commit.blob.blame
-    },
-    uri => uri
-)
-
 function truncate(s: string, max: number, omission = '…'): string {
     if (s.length <= max) {
         return s

src/extension.ts

@@ -33,14 +33,12 @@ export function activate(context: sourcegraph.ExtensionContext): void {
         // When configuration changes or onDidOpenTextDocument fires, add decorations for all blame hunks.
         const activeEditor = () => sourcegraph.app.activeWindow && sourcegraph.app.activeWindow.activeViewComponent
         context.subscriptions.add(
-            combineLatest(configurationChanges, from(sourcegraph.workspace.onDidOpenTextDocument)).subscribe(
-                async () => {
-                    const editor = activeEditor()
-                    if (editor) {
-                        await decorate(editor, null)
-                    }
+            combineLatest(configurationChanges, from(sourcegraph.workspace.openedTextDocuments)).subscribe(async () => {
+                const editor = activeEditor()
+                if (editor) {
+                    await decorate(editor, null)
                 }
-            )
+            })
         )
     }
 

yarn.lock

@@ -6176,6 +6176,11 @@ svgo@^1.0.0, svgo@^1.0.5:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
+tagged-template-noop@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/tagged-template-noop/-/tagged-template-noop-2.1.0.tgz#3501d67fd75612ab40e6040056ea881d1161c4f5"
+  integrity sha512-VOPA7ZucOLvew9xq+AwABXil7AHQZa3G7T3QOQoUveNIl3EwNsMN79JHn8v7zgpM1Pd8R36MrntUvaWqLqjg1w==
+
 tar@^4:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"