Fixed crash on class member completions with auto imports from merged ambient modules (#60340)
This commit is contained in:
Родитель
48f2ada110
Коммит
e4dc78ab8c
|
@ -891,9 +891,10 @@ function getAllExportInfoForSymbol(importingFile: SourceFile | FutureSourceFile,
|
|||
const moduleSymbolExcluded = moduleSourceFile && isFileExcluded(moduleSourceFile as SourceFile);
|
||||
return getExportInfoMap(importingFile, host, program, preferences, cancellationToken)
|
||||
.search(importingFile.path, preferCapitalized, name => name === symbolName, info => {
|
||||
const checker = getChecker(info[0].isFromPackageJson);
|
||||
if (
|
||||
getChecker(info[0].isFromPackageJson).getMergedSymbol(skipAlias(info[0].symbol, getChecker(info[0].isFromPackageJson))) === symbol
|
||||
&& (moduleSymbolExcluded || info.some(i => i.moduleSymbol === moduleSymbol || i.symbol.parent === moduleSymbol))
|
||||
checker.getMergedSymbol(skipAlias(info[0].symbol, checker)) === symbol
|
||||
&& (moduleSymbolExcluded || info.some(i => checker.getMergedSymbol(i.moduleSymbol) === moduleSymbol || i.symbol.parent === moduleSymbol))
|
||||
) {
|
||||
return info;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,67 @@
|
|||
/// <reference path="fourslash.ts" />
|
||||
|
||||
// @strict: true
|
||||
// @module: commonjs
|
||||
|
||||
// @filename: /node_modules/@types/vscode/index.d.ts
|
||||
//// declare module "vscode" {
|
||||
//// export class Position {
|
||||
//// readonly line: number;
|
||||
//// readonly character: number;
|
||||
//// }
|
||||
//// }
|
||||
|
||||
// @filename: src/motion.ts
|
||||
//// import { Position } from "vscode";
|
||||
////
|
||||
//// export abstract class MoveQuoteMatch {
|
||||
//// public override async execActionWithCount(
|
||||
//// position: Position,
|
||||
//// ): Promise<void> {}
|
||||
//// }
|
||||
////
|
||||
//// declare module "vscode" {
|
||||
//// interface Position {
|
||||
//// toString(): string;
|
||||
//// }
|
||||
//// }
|
||||
|
||||
// @filename: src/smartQuotes.ts
|
||||
//// import { MoveQuoteMatch } from "./motion";
|
||||
////
|
||||
//// export class MoveInsideNextQuote extends MoveQuoteMatch {/*1*/
|
||||
//// keys = ["i", "n", "q"];
|
||||
//// }
|
||||
|
||||
const preferences = {
|
||||
includeCompletionsWithInsertText: true,
|
||||
includeCompletionsWithClassMemberSnippets: true,
|
||||
};
|
||||
|
||||
verify.completions({
|
||||
marker: "1",
|
||||
includes: [
|
||||
{
|
||||
name: "execActionWithCount",
|
||||
insertText: "public execActionWithCount(position: Position): Promise<void> {\n}",
|
||||
filterText: "execActionWithCount",
|
||||
hasAction: true,
|
||||
source: "ClassMemberSnippet/",
|
||||
},
|
||||
],
|
||||
preferences,
|
||||
isNewIdentifierLocation: true,
|
||||
});
|
||||
|
||||
verify.applyCodeActionFromCompletion("1", {
|
||||
name: "execActionWithCount",
|
||||
source: "ClassMemberSnippet/",
|
||||
description: `Includes imports of types referenced by 'execActionWithCount'`,
|
||||
newFileContent: `import { Position } from "vscode";
|
||||
import { MoveQuoteMatch } from "./motion";
|
||||
|
||||
export class MoveInsideNextQuote extends MoveQuoteMatch {
|
||||
keys = ["i", "n", "q"];
|
||||
}`,
|
||||
preferences,
|
||||
});
|
Загрузка…
Ссылка в новой задаче