Fix some typings

redhat-developer · Nov 27, 2023 · 803d5c5 · 803d5c5
1 parent ed03cbf
commit 803d5c5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/languageservice/services/yamlSelectionRanges.ts b/src/languageservice/services/yamlSelectionRanges.ts
@@ -3,10 +3,7 @@ import { yamlDocumentsCache } from '../parser/yaml-documents';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { ASTNode } from 'vscode-json-languageservice';
 
-export function getSelectionRanges(document: TextDocument, positions: Position[]): SelectionRange[] | undefined {
-  if (!document) {
-    return;
-  }
+export function getSelectionRanges(document: TextDocument, positions: Position[]): SelectionRange[] {
   const doc = yamlDocumentsCache.getYamlDocument(document);
   return positions.map((position) => {
     const ranges = getRanges(position);

diff --git a/src/languageservice/yamlLanguageService.ts b/src/languageservice/yamlLanguageService.ts
@@ -175,7 +175,7 @@ export interface LanguageService {
   deleteSchemaContent: (schemaDeletions: SchemaDeletions) => void;
   deleteSchemasWhole: (schemaDeletions: SchemaDeletionsAll) => void;
   getFoldingRanges: (document: TextDocument, context: FoldingRangesContext) => FoldingRange[] | null;
-  getSelectionRanges: (document: TextDocument, positions: Position[]) => SelectionRange[] | undefined;
+  getSelectionRanges: (document: TextDocument, positions: Position[]) => SelectionRange[];
   getCodeAction: (document: TextDocument, params: CodeActionParams) => CodeAction[] | undefined;
   getCodeLens: (document: TextDocument) => PromiseLike<CodeLens[] | undefined> | CodeLens[] | undefined;
   resolveCodeLens: (param: CodeLens) => PromiseLike<CodeLens> | CodeLens;

diff --git a/test/yamlSelectionRanges.test.ts b/test/yamlSelectionRanges.test.ts
@@ -12,14 +12,16 @@ function isRangesEqual(range1: Range, range2: Range): boolean {
   );
 }
 
-function expectSelections(selectionRange: SelectionRange, ranges: Range[]): void {
+function expectSelections(selectionRange: SelectionRange | undefined, ranges: Range[]): void {
   for (const range of ranges) {
-    expect(selectionRange.range).eql(range);
+    expect(selectionRange?.range).eql(range);
+
     // Deduplicate ranges
-    while (selectionRange.parent && isRangesEqual(selectionRange.range, selectionRange.parent.range)) {
+    while (selectionRange?.parent && isRangesEqual(selectionRange.range, selectionRange.parent.range)) {
       selectionRange = selectionRange.parent;
     }
-    selectionRange = selectionRange.parent;
+
+    selectionRange = selectionRange?.parent;
   }
 }
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -9,7 +9,7 @@
     "outDir": "./out/server",
     "sourceMap": true,
     "target": "es2020",
-    "allowSyntheticDefaultImports": true, 
+    "allowSyntheticDefaultImports": true,
     "skipLibCheck": true
   },
   "include": [ "src", "test" ],