volar-service-typescript 0.0.20 → 0.0.22

package/{out/index.js → index.js}

@@ -17,35 +17,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const semver = require("semver");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-const shared_1 = require("./shared");
+const shared_1 = require("./lib/shared");
 const typescript_1 = require("@volar/typescript");
 const tsFaster = require("typescript-auto-import-cache");
-const _callHierarchy = require("./features/callHierarchy");
-const codeActions = require("./features/codeAction");
-const codeActionResolve = require("./features/codeActionResolve");
-const completions = require("./features/completions/basic");
-const directiveCommentCompletions = require("./features/completions/directiveComment");
-const jsDocCompletions = require("./features/completions/jsDoc");
-const completionResolve = require("./features/completions/resolve");
-const definitions = require("./features/definition");
-const diagnostics = require("./features/diagnostics");
-const documentHighlight = require("./features/documentHighlight");
-const documentSymbol = require("./features/documentSymbol");
-const fileReferences = require("./features/fileReferences");
-const fileRename = require("./features/fileRename");
-const foldingRanges = require("./features/foldingRanges");
-const formatting = require("./features/formatting");
-const hover = require("./features/hover");
-const implementation = require("./features/implementation");
-const inlayHints = require("./features/inlayHints");
-const prepareRename = require("./features/prepareRename");
-const references = require("./features/references");
-const rename = require("./features/rename");
-const selectionRanges = require("./features/selectionRanges");
-const semanticTokens = require("./features/semanticTokens");
-const signatureHelp = require("./features/signatureHelp");
-const typeDefinitions = require("./features/typeDefinition");
-const workspaceSymbols = require("./features/workspaceSymbol");
+const _callHierarchy = require("./lib/features/callHierarchy");
+const codeActions = require("./lib/features/codeAction");
+const codeActionResolve = require("./lib/features/codeActionResolve");
+const completions = require("./lib/features/completions/basic");
+const directiveCommentCompletions = require("./lib/features/completions/directiveComment");
+const jsDocCompletions = require("./lib/features/completions/jsDoc");
+const completionResolve = require("./lib/features/completions/resolve");
+const definitions = require("./lib/features/definition");
+const diagnostics = require("./lib/features/diagnostics");
+const documentHighlight = require("./lib/features/documentHighlight");
+const documentSymbol = require("./lib/features/documentSymbol");
+const fileReferences = require("./lib/features/fileReferences");
+const fileRename = require("./lib/features/fileRename");
+const foldingRanges = require("./lib/features/foldingRanges");
+const formatting = require("./lib/features/formatting");
+const hover = require("./lib/features/hover");
+const implementation = require("./lib/features/implementation");
+const inlayHints = require("./lib/features/inlayHints");
+const prepareRename = require("./lib/features/prepareRename");
+const references = require("./lib/features/references");
+const rename = require("./lib/features/rename");
+const selectionRanges = require("./lib/features/selectionRanges");
+const semanticTokens = require("./lib/features/semanticTokens");
+const signatureHelp = require("./lib/features/signatureHelp");
+const typeDefinitions = require("./lib/features/typeDefinition");
+const workspaceSymbols = require("./lib/features/workspaceSymbol");
 __exportStar(require("@volar/typescript"), exports);
 ;
 function create(ts) {
@@ -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 → lib}/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/lib/features/references.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.register = void 0;
+const shared_1 = require("../shared");
+const transforms_1 = require("../utils/transforms");
+function register(ctx) {
+    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 references = (0, shared_1.safeCall)(() => ctx.typescript.languageService.findReferences(fileName, offset));
+        if (!references)
+            return [];
+        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;
+//# sourceMappingURL=references.js.map

package/lib/protocol.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=protocol.d.ts.map

package/lib/protocol.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=protocol.js.map

package/lib/utils/previewer.d.ts

@@ -0,0 +1,13 @@
+import type * as ts from 'typescript/lib/tsserverlibrary';
+import type { SharedContext } from '../types';
+export interface IFilePathToResourceConverter {
+    /**
+     * Convert a typescript filepath to a VS Code resource.
+     */
+    toResource(filepath: string): string;
+}
+export declare function plainWithLinks(parts: readonly ts.server.protocol.SymbolDisplayPart[] | string, filePathConverter: IFilePathToResourceConverter, ctx: SharedContext): string;
+export declare function tagsMarkdownPreview(tags: readonly ts.JSDocTagInfo[], filePathConverter: IFilePathToResourceConverter, ctx: SharedContext): string;
+export declare function markdownDocumentation(documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined, tags: ts.JSDocTagInfo[] | undefined, filePathConverter: IFilePathToResourceConverter, ctx: SharedContext): string;
+export declare function addMarkdownDocumentation(out: string, documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined, tags: ts.JSDocTagInfo[] | undefined, converter: IFilePathToResourceConverter, ctx: SharedContext): string;
+//# sourceMappingURL=previewer.d.ts.map

package/lib/utils/snippetForFunctionCall.d.ts

@@ -0,0 +1,9 @@
+import type * as ts from 'typescript/lib/tsserverlibrary';
+export declare function snippetForFunctionCall(item: {
+    insertText?: string;
+    label: string;
+}, displayParts: ReadonlyArray<ts.server.protocol.SymbolDisplayPart>): {
+    snippet: string;
+    parameterCount: number;
+};
+//# sourceMappingURL=snippetForFunctionCall.d.ts.map

package/{out → lib}/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 → lib}/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.22",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -11,8 +11,8 @@
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
-		"out/**/*.js",
-		"out/**/*.d.ts"
+		"**/*.js",
+		"**/*.d.ts"
 	],
 	"repository": {
 		"type": "git",
@@ -46,5 +46,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "54393c9ecc340b229579c534e65ab3b8e097f974"
+	"gitHead": "6fb3db40aff2f3dbce116fc24b49c186ff5c0e5e"
 }

package/out/features/references.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.register = void 0;
-const shared_1 = require("../shared");
-const transforms_1 = require("../utils/transforms");
-function register(ctx) {
-    return (uri, position) => {
-        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)
-            return [];
-        return (0, transforms_1.entriesToLocations)([...entries], ctx);
-    };
-}
-exports.register = register;
-//# sourceMappingURL=references.js.map

package/out/utils/previewer.d.ts

@@ -1,14 +0,0 @@
-import type * as ts from 'typescript/lib/tsserverlibrary';
-import type * as Proto from '../protocol';
-import type { SharedContext } from '../types';
-export interface IFilePathToResourceConverter {
-    /**
-     * Convert a typescript filepath to a VS Code resource.
-     */
-    toResource(filepath: string): string;
-}
-export declare function plainWithLinks(parts: readonly Proto.SymbolDisplayPart[] | string, filePathConverter: IFilePathToResourceConverter, ctx: SharedContext): string;
-export declare function tagsMarkdownPreview(tags: readonly ts.JSDocTagInfo[], filePathConverter: IFilePathToResourceConverter, ctx: SharedContext): string;
-export declare function markdownDocumentation(documentation: Proto.SymbolDisplayPart[] | string | undefined, tags: ts.JSDocTagInfo[] | undefined, filePathConverter: IFilePathToResourceConverter, ctx: SharedContext): string;
-export declare function addMarkdownDocumentation(out: string, documentation: Proto.SymbolDisplayPart[] | string | undefined, tags: ts.JSDocTagInfo[] | undefined, converter: IFilePathToResourceConverter, ctx: SharedContext): string;
-//# sourceMappingURL=previewer.d.ts.map

package/out/utils/snippetForFunctionCall.d.ts

@@ -1,9 +0,0 @@
-import type * as Proto from '../protocol';
-export declare function snippetForFunctionCall(item: {
-    insertText?: string;
-    label: string;
-}, displayParts: ReadonlyArray<Proto.SymbolDisplayPart>): {
-    snippet: string;
-    parameterCount: number;
-};
-//# sourceMappingURL=snippetForFunctionCall.d.ts.map