refactor: use @sourcegraph/extension-api-types instead of vscode types

Author: sqs

package-lock.json

@@ -30,12 +30,12 @@
   "author": "Felix Becker <[email protected]>",
   "dependencies": {
     "@sourcegraph/event-positions": "^1.0.0",
+    "@sourcegraph/extension-api-types": "^1.0.1",
     "@sourcegraph/react-loading-spinner": "0.0.7",
     "lodash": "^4.17.10",
     "mdi-react": "^5.1.0",
     "rxjs": "^6.3.3",
-    "ts-key-enum": "^2.0.0",
-    "vscode-languageserver-types": "^3.8.2"
+    "ts-key-enum": "^2.0.0"
   },
   "peerDependencies": {
     "react": "^16.0.0"

package.json

@@ -1,8 +1,8 @@
+import { Range } from '@sourcegraph/extension-api-types'
 import { isEqual } from 'lodash'
 import { EMPTY, NEVER, Observable, of, Subject, Subscription } from 'rxjs'
 import { distinctUntilChanged, filter, map } from 'rxjs/operators'
 import { TestScheduler } from 'rxjs/testing'
-import { Range } from 'vscode-languageserver-types'
 
 import { noop } from 'lodash'
 import { propertyIsDefined } from './helpers'
@@ -205,7 +205,6 @@ describe('Hoverifier', () => {
                         fetchJumpURL: position =>
                             position.line === 24 ? createStubJumpURLFetcher('def url', delayTime)(position) : of(null),
                         pushHistory: noop,
-                        getReferencesURL: () => null,
                     })
 
                     const positionJumps = new Subject<PositionJump>()
@@ -278,7 +277,6 @@ describe('Hoverifier', () => {
                         fetchJumpURL: position =>
                             position.line === 24 ? createStubJumpURLFetcher('def url')(position) : of(null),
                         pushHistory: noop,
-                        getReferencesURL: () => null,
                     })
 
                     const positionJumps = new Subject<PositionJump>()

src/hoverifier.test.ts

@@ -1,3 +1,4 @@
+import { Position, Range } from '@sourcegraph/extension-api-types'
 import { isEqual } from 'lodash'
 import {
     combineLatest,
@@ -27,7 +28,6 @@ import {
     withLatestFrom,
 } from 'rxjs/operators'
 import { Key } from 'ts-key-enum'
-import { Position, Range } from 'vscode-languageserver-types'
 import { asError, ErrorLike, isErrorLike } from './errors'
 import { scrollIntoCenterIfNeeded } from './helpers'
 import { HoverOverlayProps, isJumpURL } from './HoverOverlay'
@@ -42,7 +42,7 @@ import {
     getTokenAtPosition,
     HoveredToken,
 } from './token_position'
-import { HoverAttachment, isHoverAttachmentWithRange, LineOrPositionOrRange, LOADING } from './types'
+import { HoverAttachment, isHoverAttachmentWithRange, isPosition, LineOrPositionOrRange, LOADING } from './types'
 
 export { HoveredToken }
 
@@ -437,7 +437,7 @@ export function createHoverifier<C extends object>({
             let cell: HTMLElement | null
             let target: HTMLElement | undefined
             let part: DiffPart | undefined
-            if (Position.is(position)) {
+            if (isPosition(position)) {
                 cell = dom.getCodeElementFromLineNumber(codeView, position.line, position.part)
                 if (cell) {
                     target = findElementWithOffset(cell, position.character)
@@ -479,7 +479,7 @@ export function createHoverifier<C extends object>({
                     })
                 ),
                 switchMap(({ position, codeView, adjustPosition, resolveContext, ...rest }) => {
-                    if (!position || !Position.is(position) || !adjustPosition) {
+                    if (!position || !isPosition(position) || !adjustPosition) {
                         return of({ position, codeView, ...rest })
                     }
 
@@ -502,7 +502,7 @@ export function createHoverifier<C extends object>({
                     // that tokens span multiple elements meaning that it's possible for the hover overlay to be
                     // placed in the middle of a token.
                     target:
-                        position && Position.is(position)
+                        position && isPosition(position)
                             ? getTokenAtPosition(codeView, position, dom, position.part)
                             : target,
                     ...rest,
@@ -522,7 +522,7 @@ export function createHoverifier<C extends object>({
         map(({ position, resolveContext, eventType, ...rest }) => ({
             ...rest,
             eventType,
-            position: Position.is(position) ? { ...position, ...resolveContext(position) } : undefined,
+            position: isPosition(position) ? { ...position, ...resolveContext(position) } : undefined,
         })),
         share()
     )

src/hoverifier.ts

@@ -1,7 +1,7 @@
+import { Position } from '@sourcegraph/extension-api-types'
 import { of } from 'rxjs'
 import { filter, map } from 'rxjs/operators'
 import { TestScheduler } from 'rxjs/testing'
-import { Position } from 'vscode-languageserver-types'
 
 import { CodeViewProps, DOM } from './testutils/dom'
 import { dispatchMouseEventAtPositionImpure } from './testutils/mouse'

src/positions.test.ts

@@ -1,7 +1,7 @@
 import { from, fromEvent, merge, Observable, Subscribable } from 'rxjs'
 import { filter, map, switchMap, tap } from 'rxjs/operators'
-import { Position } from 'vscode-languageserver-types'
 import { convertCodeElementIdempotent, DiffPart, DOMFunctions, HoveredToken, locateTarget } from './token_position'
+import { isPosition } from './types'
 
 export type SupportedMouseEvent = 'click' | 'mousemove' | 'mouseover'
 
@@ -70,7 +70,7 @@ export const findPositionsFromEvents = (options: DOMFunctions) => (
         // Find out the position that was hovered over
         map(({ target, codeView, ...rest }) => {
             const hoveredToken = locateTarget(target, options)
-            const position = Position.is(hoveredToken) ? hoveredToken : undefined
+            const position = isPosition(hoveredToken) ? hoveredToken : undefined
             return { position, codeView, ...rest }
         })
     )

src/positions.ts

@@ -1,5 +1,5 @@
 import { CharacterPositions } from '@sourcegraph/event-positions'
-import { Position } from 'vscode-languageserver-types'
+import { Position } from '@sourcegraph/extension-api-types'
 import { convertNode } from '../token_position'
 import { CodeViewProps } from './dom'
 

src/testutils/mouse.ts

@@ -1,5 +1,5 @@
+import { Position } from '@sourcegraph/extension-api-types'
 import * as assert from 'assert'
-import { Position } from 'vscode-languageserver-types'
 import { CodeViewProps, DOM } from './testutils/dom'
 import {
     convertNode,

src/token_position.test.ts

@@ -1,4 +1,4 @@
-import { Position } from 'vscode-languageserver-types'
+import { Position } from '@sourcegraph/extension-api-types'
 import { LineOrPositionOrRange } from './types'
 
 /**

src/token_position.ts

@@ -1,4 +1,4 @@
-import { Range } from 'vscode-languageserver-types'
+import { Position, Range } from '@sourcegraph/extension-api-types'
 
 export const LOADING: 'loading' = 'loading'
 
@@ -28,6 +28,13 @@ export function isHoverAttachmentWithRange(value: any): value is HoverAttachment
     )
 }
 
+/**
+ * Reports whether {@link value} is a {@link Position}.
+ */
+export function isPosition(value: any): value is Position {
+    return value && typeof value.line === 'number' && typeof value.character === 'number'
+}
+
 /**
  * Represents a line, a position, a line range, or a position range. It forbids
  * just a character, or a range from a line to a position or vice versa (such as