Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2024-12-16 21:46:22 -05:00
Code Issues Activity

Support for import suggestions in the languageserver (#204)

Browse source 
* Support for import suggestions in the languageserver

https://www.loom.com/share/21921be3ebd1403aa4aaa4f39587efdb

* Add the changeset
This commit is contained in:
Matthew Phillips 2021-05-13 11:26:40 -04:00 committed by GitHub
parent 000464bf35
commit 06e2597dd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.changeset/tiny-pumas-warn.md Normal file
View file

@ -0,0 +1,6 @@
---
'astro-languageserver': minor
'astro-vscode': minor
---
Adds support for import suggestions

1
tools/astro-languageserver/package.json
View file

@ -19,6 +19,7 @@
"astro-scripts": "0.0.1"
},
"dependencies": {
"typescript": "^4.3.1-rc",
"vscode-emmet-helper": "2.1.2",
"vscode-html-languageservice": "^3.0.3",
"vscode-languageserver": "6.1.1",

2
tools/astro-languageserver/src/plugins/typescript/astro-sys.ts
View file

@ -22,7 +22,7 @@ export function createAstroSys(getSnapshot: (fileName: string) => DocumentSnapsh
return snapshot.getFullText();
},
readDirectory(path, extensions, exclude, include, depth) {
const extensionsWithAstro = (extensions ?? []).concat(...['.astro']);
const extensionsWithAstro = (extensions ?? []).concat(...['.astro', '.svelte', '.vue']);
const result = ts.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
return result;
},

13
tools/astro-languageserver/src/plugins/typescript/features/CompletionsProvider.ts
View file

@ -26,12 +26,11 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
const fragment = await tsDoc.getFragment();
const offset = document.offsetAt(position);
const entries =
lang.getCompletionsAtPosition(fragment.filePath, offset, {
importModuleSpecifierPreference: 'relative',
importModuleSpecifierEnding: 'auto',
quotePreference: 'single',
})?.entries || [];
const entries = lang.getCompletionsAtPosition(fragment.filePath, offset, {
importModuleSpecifierPreference: 'relative',
importModuleSpecifierEnding: 'js',
quotePreference: 'single',
})?.entries || [];
const completionItems = entries
.map((entry: ts.CompletionEntry) => this.toCompletionItem(fragment, entry, document.uri, position, new Set()))
@ -55,7 +54,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
}
const fragment = await tsDoc.getFragment();
const detail = lang.getCompletionEntryDetails(filePath, fragment.offsetAt(comp.position), comp.name, {}, comp.source, {});
const detail = lang.getCompletionEntryDetails(filePath, fragment.offsetAt(comp.position), comp.name, {}, comp.source, {}, undefined);
if (detail) {
const { detail: itemDetail, documentation: itemDocumentation } = this.getCompletionDocument(detail);

17
tools/astro-languageserver/src/plugins/typescript/languageService.ts
View file

@ -71,8 +71,12 @@ async function createLanguageService(tsconfigPath: string, workspaceRoot: string
]);
let projectVersion = 0;
const snapshotManager = new SnapshotManager(project.fileNames, { exclude: ['node_modules', 'dist'], include: ['astro'] }, workspaceRoot || process.cwd());
const snapshotManager = new SnapshotManager(project.fileNames, {
exclude: ['node_modules', 'dist'],
include: ['src']
}, workspaceRoot || process.cwd());
const astroModuleLoader = createAstroModuleLoader(getScriptSnapshot, {});
const host: ts.LanguageServiceHost = {
@ -93,10 +97,10 @@ async function createLanguageService(tsconfigPath: string, workspaceRoot: string
getProjectVersion: () => `${projectVersion}`,
getScriptFileNames: () => Array.from(new Set([...snapshotManager.getFileNames(), ...snapshotManager.getProjectFileNames()])),
getScriptSnapshot,
getScriptVersion: (fileName: string) => getScriptSnapshot(fileName).version.toString(),
getScriptVersion: (fileName: string) => getScriptSnapshot(fileName).version.toString()
};
const languageService = ts.createLanguageService(host);
const languageService: ts.LanguageService = ts.createLanguageService(host);
const languageServiceProxy = new Proxy(languageService, {
get(target, prop) {
return Reflect.get(target, prop);
@ -111,6 +115,10 @@ async function createLanguageService(tsconfigPath: string, workspaceRoot: string
deleteDocument,
};
function onProjectUpdated() {
projectVersion++;
}
function deleteDocument(filePath: string) {
snapshotManager.delete(filePath);
}
@ -131,6 +139,7 @@ async function createLanguageService(tsconfigPath: string, workspaceRoot: string
const currentText = document ? document.getText() : null;
const snapshot = createDocumentSnapshot(filePath, currentText, docContext.createDocument);
snapshotManager.set(filePath, snapshot);
onProjectUpdated();
return snapshot;
}
@ -161,7 +170,7 @@ function getDefaultJsConfig(): {
allowSyntheticDefaultImports: true,
allowJs: true,
},
include: ['astro'],
include: ['src'],
};
}

5
yarn.lock
View file

@ -11405,6 +11405,11 @@ typescript@^4.2.4:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
typescript@^4.3.1-rc:
version "4.3.1-rc"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.1-rc.tgz#925149c8d8514e20a6bd8d4bd7f42adac67ab59c"
integrity sha512-L3uJ0gcntaRaKni9aV2amYB+pCDVodKe/B5+IREyvtKGsDOF7cYjchHb/B894skqkgD52ykRuWatIZMqEsHIqA==
ua-parser-js@^0.7.18:
version "0.7.28"
resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz"