WIP.

Author: efritz

src/common/cancellation.ts

@@ -1,25 +1,7 @@
 import { CancellationToken, CancellationTokenSource } from 'vscode-jsonrpc'
+import { createAbortError } from '@sourcegraph/basic-code-intel'
 
-export interface AbortError extends Error {
-    name: 'AbortError'
-}
-
-/**
- * Creates an Error with name "AbortError"
- */
-export const createAbortError = (): AbortError => Object.assign(new Error('Aborted'), { name: 'AbortError' as const })
-
-/**
- * Returns true if the given value is an AbortError
- */
-export const isAbortError = (err: any): err is AbortError =>
-    typeof err === 'object' && err !== null && err.name === 'AbortError'
-
-export function throwIfAbortError(err: unknown): void {
-    if (isAbortError(err)) {
-        throw err
-    }
-}
+export { AbortError, createAbortError, isAbortError, throwIfAbortError } from '@sourcegraph/basic-code-intel'
 
 /**
  * Throws an AbortError if the given AbortSignal is already aborted

src/extension/basic-code-intel.ts

@@ -1,35 +1,33 @@
-import { Handler, Providers } from '@sourcegraph/basic-code-intel'
+import { HandlerArgs } from '@sourcegraph/basic-code-intel'
 import * as path from 'path'
 import * as sourcegraph from 'sourcegraph'
 
-export function initBasicCodeIntel(): Providers {
-    return new Handler({
-        sourcegraph,
-        languageID: 'typescript',
-        fileExts: ['ts', 'tsx', 'js', 'jsx'],
-        commentStyle: {
-            lineRegex: /\/\/\s?/,
-            block: {
-                startRegex: /\/\*\*?/,
-                lineNoiseRegex: /(^\s*\*\s?)?/,
-                endRegex: /\*\//,
-            },
+export const handlerArgs: HandlerArgs = {
+    sourcegraph,
+    languageID: 'typescript',
+    fileExts: ['ts', 'tsx', 'js', 'jsx'],
+    commentStyle: {
+        lineRegex: /\/\/\s?/,
+        block: {
+            startRegex: /\/\*\*?/,
+            lineNoiseRegex: /(^\s*\*\s?)?/,
+            endRegex: /\*\//,
         },
-        filterDefinitions: ({ filePath, fileContent, results }) => {
-            const imports = fileContent
-                .split('\n')
-                .map(line => {
-                    // Matches the import at index 1
-                    const match = /\bfrom ['"](.*)['"];?$/.exec(line) || /\brequire\(['"](.*)['"]\)/.exec(line)
-                    return match ? match[1] : undefined
-                })
-                .filter((x): x is string => Boolean(x))
+    },
+    filterDefinitions: ({ filePath, fileContent, results }) => {
+        const imports = fileContent
+            .split('\n')
+            .map(line => {
+                // Matches the import at index 1
+                const match = /\bfrom ['"](.*)['"];?$/.exec(line) || /\brequire\(['"](.*)['"]\)/.exec(line)
+                return match ? match[1] : undefined
+            })
+            .filter((x): x is string => Boolean(x))
 
-            const filteredResults = results.filter(result =>
-                imports.some(i => path.join(path.dirname(filePath), i) === result.file.replace(/\.[^/.]+$/, ''))
-            )
+        const filteredResults = results.filter(result =>
+            imports.some(i => path.join(path.dirname(filePath), i) === result.file.replace(/\.[^/.]+$/, ''))
+        )
 
-            return filteredResults.length === 0 ? results : filteredResults
-        },
-    })
+        return filteredResults.length === 0 ? results : filteredResults
+    },
 }