volar-service-typescript 0.0.20 → 0.0.21

package/out/features/references.d.ts

@@ -1,4 +1,4 @@
 import type * as vscode from '@volar/language-service';
 import type { SharedContext } from '../types';
-export declare function register(ctx: SharedContext): (uri: string, position: vscode.Position) => vscode.Location[];
+export declare function register(ctx: SharedContext): (uri: string, position: vscode.Position, referenceContext: vscode.ReferenceContext) => vscode.Location[];
 //# sourceMappingURL=references.d.ts.map

package/out/features/references.js

@@ -4,16 +4,31 @@ exports.register = void 0;
 const shared_1 = require("../shared");
 const transforms_1 = require("../utils/transforms");
 function register(ctx) {
-    return (uri, position) => {
+    return (uri, position, referenceContext) => {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
         const fileName = ctx.env.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const entries = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getReferencesAtPosition(fileName, offset));
-        if (!entries)
+        const references = (0, shared_1.safeCall)(() => ctx.typescript.languageService.findReferences(fileName, offset));
+        if (!references)
             return [];
-        return (0, transforms_1.entriesToLocations)([...entries], ctx);
+        const result = [];
+        for (const reference of references) {
+            if (referenceContext.includeDeclaration) {
+                const definition = (0, transforms_1.entryToLocation)(reference.definition, ctx);
+                if (definition) {
+                    result.push(definition);
+                }
+            }
+            for (const referenceEntry of reference.references) {
+                const reference = (0, transforms_1.entryToLocation)(referenceEntry, ctx);
+                if (reference) {
+                    result.push(reference);
+                }
+            }
+        }
+        return result;
     };
 }
 exports.register = register;

package/out/index.js

@@ -421,11 +421,11 @@ function create(ts) {
                         return findImplementations(document.uri, position);
                     });
                 },
-                provideReferences(document, position, token) {
+                provideReferences(document, position, referenceContext, token) {
                     if (!(0, shared_1.isTsDocument)(document) && !(0, shared_1.isJsonDocument)(document))
                         return;
                     return worker(token, () => {
-                        return findReferences(document.uri, position);
+                        return findReferences(document.uri, position, referenceContext);
                     });
                 },
                 provideFileReferences(document, token) {

package/out/utils/transforms.d.ts

@@ -6,6 +6,10 @@ export declare function entriesToLocations(entries: {
     fileName: string;
     textSpan: ts.TextSpan;
 }[], ctx: SharedContext): vscode.Location[];
+export declare function entryToLocation(entry: {
+    fileName: string;
+    textSpan: ts.TextSpan;
+}, ctx: SharedContext): vscode.Location | undefined;
 export declare function entriesToLocationLinks<T extends ts.DocumentSpan>(entries: T[], ctx: SharedContext): vscode.LocationLink[];
 export declare function boundSpanToLocationLinks(info: ts.DefinitionInfoAndBoundSpan, originalDoc: TextDocument, ctx: SharedContext): vscode.LocationLink[];
 //# sourceMappingURL=transforms.d.ts.map

package/out/utils/transforms.js

@@ -1,23 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.boundSpanToLocationLinks = exports.entriesToLocationLinks = exports.entriesToLocations = void 0;
+exports.boundSpanToLocationLinks = exports.entriesToLocationLinks = exports.entryToLocation = exports.entriesToLocations = void 0;
 function entriesToLocations(entries, ctx) {
-    const locations = [];
-    for (const entry of entries) {
-        const entryUri = ctx.env.fileNameToUri(entry.fileName);
-        const doc = ctx.getTextDocument(entryUri);
-        if (!doc)
-            continue;
-        const range = {
-            start: doc.positionAt(entry.textSpan.start),
-            end: doc.positionAt(entry.textSpan.start + entry.textSpan.length),
-        };
-        const location = { uri: entryUri, range };
-        locations.push(location);
-    }
-    return locations;
+    return entries
+        .map(entry => entryToLocation(entry, ctx))
+        .filter((location) => !!location);
 }
 exports.entriesToLocations = entriesToLocations;
+function entryToLocation(entry, ctx) {
+    const entryUri = ctx.env.fileNameToUri(entry.fileName);
+    const doc = ctx.getTextDocument(entryUri);
+    if (!doc)
+        return;
+    const range = {
+        start: doc.positionAt(entry.textSpan.start),
+        end: doc.positionAt(entry.textSpan.start + entry.textSpan.length),
+    };
+    const location = { uri: entryUri, range };
+    return location;
+}
+exports.entryToLocation = entryToLocation;
 function entriesToLocationLinks(entries, ctx) {
     const locations = [];
     for (const entry of entries) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.20",
+	"version": "0.0.21",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -46,5 +46,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "54393c9ecc340b229579c534e65ab3b8e097f974"
+	"gitHead": "d4023ed503951199b1a9a4b7efe82f4edba42141"
 }