Skip to content

feat(language-service): Support importing the external module's expor… #2173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
.npmrc=974837034
pnpm-lock.yaml=-1331107132
yarn.lock=-1794001287
package.json=-951386062
package.json=1038264142
pnpm-workspace.yaml=1711114604
5 changes: 5 additions & 0 deletions client/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,11 @@ export class AngularLanguageClient implements vscode.Disposable {
args.push('--includeCompletionsWithSnippetText');
}

const includeCompletionsForModuleExports = config.get<boolean>('angular.suggest.autoImports');
if (includeCompletionsForModuleExports) {
args.push('--includeCompletionsForModuleExports');
}

// Sort the versions from oldest to newest.
const angularVersions = (await getAngularVersionsInWorkspace(this.outputChannel))
.sort((a, b) => a.version.greaterThanOrEqual(b.version) ? 1 : -1);
Expand Down
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@
"default": true,
"markdownDescription": "Enable snippet completions from Angular language server. Requires using TypeScript 4.3+ in the workspace."
},
"angular.suggest.autoImports": {
"type": "boolean",
"default": true,
"markdownDescription": "Enable/disable auto import suggestions."
},
"angular.forceStrictTemplates": {
"type": "boolean",
"default": false,
Expand Down
2 changes: 2 additions & 0 deletions server/src/cmdline_utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ interface CommandLineOptions {
tsdk: string|null;
includeAutomaticOptionalChainCompletions: boolean;
includeCompletionsWithSnippetText: boolean;
includeCompletionsForModuleExports: boolean;
forceStrictTemplates: boolean;
disableBlockSyntax: boolean;
disableLetSyntax: boolean;
Expand All @@ -55,6 +56,7 @@ export function parseCommandLine(argv: string[]): CommandLineOptions {
includeAutomaticOptionalChainCompletions:
hasArgument(argv, '--includeAutomaticOptionalChainCompletions'),
includeCompletionsWithSnippetText: hasArgument(argv, '--includeCompletionsWithSnippetText'),
includeCompletionsForModuleExports: hasArgument(argv, '--includeCompletionsForModuleExports'),
forceStrictTemplates: hasArgument(argv, '--forceStrictTemplates'),
disableBlockSyntax: hasArgument(argv, '--disableBlockSyntax'),
disableLetSyntax: hasArgument(argv, '--disableLetSyntax'),
Expand Down
3 changes: 3 additions & 0 deletions server/src/completion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export interface NgCompletionOriginData {

filePath: string;
position: lsp.Position;

tsData?: ts.CompletionEntryData;
}

/**
Expand Down Expand Up @@ -135,6 +137,7 @@ export function tsCompletionEntryToLspCompletionItem(
kind: 'ngCompletionOriginData',
filePath: scriptInfo.fileName,
position,
tsData: entry.data,
} as NgCompletionOriginData;
return item;
}
Expand Down
1 change: 1 addition & 0 deletions server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function main() {
logToConsole: options.logToConsole,
includeAutomaticOptionalChainCompletions: options.includeAutomaticOptionalChainCompletions,
includeCompletionsWithSnippetText: options.includeCompletionsWithSnippetText,
includeCompletionsForModuleExports: options.includeCompletionsForModuleExports,
forceStrictTemplates: isG3 || options.forceStrictTemplates,
disableBlockSyntax: options.disableBlockSyntax,
disableLetSyntax: options.disableLetSyntax,
Expand Down
18 changes: 14 additions & 4 deletions server/src/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export interface SessionOptions {
logToConsole: boolean;
includeAutomaticOptionalChainCompletions: boolean;
includeCompletionsWithSnippetText: boolean;
includeCompletionsForModuleExports: boolean;
forceStrictTemplates: boolean;
disableBlockSyntax: boolean;
disableLetSyntax: boolean;
Expand All @@ -49,7 +50,7 @@ const EMPTY_RANGE = lsp.Range.create(0, 0, 0, 0);
const setImmediateP = promisify(setImmediate);

const defaultFormatOptions: ts.FormatCodeSettings = {};
const defaultPreferences: ts.UserPreferences = {};
let defaultPreferences: ts.UserPreferences = {};

const htmlLS = getHTMLLanguageService();

Expand All @@ -70,6 +71,7 @@ export class Session {
private readonly openFiles = new MruTracker();
private readonly includeAutomaticOptionalChainCompletions: boolean;
private readonly includeCompletionsWithSnippetText: boolean;
private readonly includeCompletionsForModuleExports: boolean;
private snippetSupport: boolean|undefined;
private diagnosticsTimeout: NodeJS.Timeout|null = null;
private isProjectLoading = false;
Expand All @@ -86,8 +88,13 @@ export class Session {
this.includeAutomaticOptionalChainCompletions =
options.includeAutomaticOptionalChainCompletions;
this.includeCompletionsWithSnippetText = options.includeCompletionsWithSnippetText;
this.includeCompletionsForModuleExports = options.includeCompletionsForModuleExports;
this.logger = options.logger;
this.logToConsole = options.logToConsole;
defaultPreferences = {
...defaultPreferences,
includeCompletionsForModuleExports: options.includeCompletionsForModuleExports,
};
// Create a connection for the server. The connection uses Node's IPC as a transport.
this.connection = lsp.createConnection({
// cancelUndispatched is a "middleware" to handle all cancellation requests.
Expand Down Expand Up @@ -150,6 +157,7 @@ export class Session {
// We don't want the AutoImportProvider projects to be created. See
// https://devblogs.microsoft.com/typescript/announcing-typescript-4-0/#smarter-auto-imports
includePackageJsonAutoImports: 'off',
includeCompletionsForModuleExports: this.includeCompletionsForModuleExports,
},
watchOptions: {
// Used as watch options when not specified by user's `tsconfig`.
Expand Down Expand Up @@ -1234,12 +1242,14 @@ export class Session {
let options: ts.GetCompletionsAtPositionOptions = {};
const includeCompletionsWithSnippetText =
this.includeCompletionsWithSnippetText && this.snippetSupport;
if (this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText) {
if (this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText ||
this.includeCompletionsForModuleExports) {
options = {
includeAutomaticOptionalChainCompletions: this.includeAutomaticOptionalChainCompletions,
includeCompletionsWithSnippetText: includeCompletionsWithSnippetText,
includeCompletionsWithInsertText:
this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText,
includeCompletionsForModuleExports: this.includeCompletionsForModuleExports,
};
}

Expand Down Expand Up @@ -1269,8 +1279,8 @@ export class Session {

const offset = lspPositionToTsPosition(scriptInfo, position);
const details = languageService.getCompletionEntryDetails(
filePath, offset, item.insertText ?? item.label, undefined, undefined, undefined,
undefined);
filePath, offset, item.insertText ?? item.label, undefined, undefined, defaultPreferences,
data.tsData);
if (details === undefined) {
return item;
}
Expand Down
Loading