refactor: remove isHoverAttachmentWithRange

Author: sqs

src/hoverifier.ts

@@ -42,7 +42,7 @@ import {
     getTokenAtPosition,
     HoveredToken,
 } from './token_position'
-import { HoverAttachment, isHoverAttachmentWithRange, isPosition, LineOrPositionOrRange, LOADING } from './types'
+import { HoverAttachment, isPosition, LineOrPositionOrRange, LOADING } from './types'
 
 export { HoveredToken }
 
@@ -602,7 +602,11 @@ export function createHoverifier<C extends object, D, A>({
                 switchMap(hoverObservable => hoverObservable),
                 switchMap(({ hoverOrError, position, adjustPosition, ...rest }) => {
                     let pos =
-                        isHoverAttachmentWithRange(hoverOrError) && position
+                        hoverOrError &&
+                        hoverOrError !== LOADING &&
+                        !isErrorLike(hoverOrError) &&
+                        hoverOrError.range &&
+                        position
                             ? { ...hoverOrError.range.start, ...position }
                             : position
 

src/types.ts

@@ -13,21 +13,6 @@ export interface HoverAttachment {
     range?: Range
 }
 
-/**
- * Reports whether {@link value} is a {@link HoverAttachment} value with a range.
- */
-export function isHoverAttachmentWithRange(value: any): value is HoverAttachment & { range: Range } {
-    return (
-        value &&
-        value.range &&
-        value.range.start &&
-        typeof value.range.start.line === 'number' &&
-        typeof value.range.start.character === 'number' &&
-        typeof value.range.end.line === 'number' &&
-        typeof value.range.end.character === 'number'
-    )
-}
-
 /**
  * Reports whether {@link value} is a {@link Position}.
  */