Skip to content
Merged
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
2 changes: 1 addition & 1 deletion src/services/completions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2045,7 +2045,7 @@ function completionEntryDataToSymbolOriginInfo(data: CompletionEntryData, comple

function getInsertTextAndReplacementSpanForImportCompletion(name: string, importStatementCompletion: ImportStatementCompletionInfo, origin: SymbolOriginInfoResolvedExport, useSemicolons: boolean, sourceFile: SourceFile, options: CompilerOptions, preferences: UserPreferences) {
const replacementSpan = importStatementCompletion.replacementSpan;
const quotedModuleSpecifier = quote(sourceFile, preferences, origin.moduleSpecifier);
const quotedModuleSpecifier = quote(sourceFile, preferences, escapeSnippetText(origin.moduleSpecifier));
const exportKind =
origin.isDefaultExport ? ExportKind.Default :
origin.exportName === InternalSymbolName.ExportEquals ? ExportKind.ExportEquals :
Expand Down
106 changes: 106 additions & 0 deletions tests/baselines/reference/importStatementCompletions3.baseline
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
=== /tests/cases/fourslash/./bar.ts ===
// import f
// ^
// | ----------------------------------------------------------------------
// | function foo(): void
// | type
// | ----------------------------------------------------------------------

[
{
"marker": {
"fileName": "/tests/cases/fourslash/./bar.ts",
"position": 8,
"name": ""
},
"item": {
"flags": 11,
"isGlobalCompletion": false,
"isMemberCompletion": false,
"isNewIdentifierLocation": true,
"optionalReplacementSpan": {
"start": 7,
"length": 1
},
"entries": [
{
"name": "foo",
"kind": "function",
"kindModifiers": "export",
"sortText": "11",
"source": [
{
"text": "./$foo",
"kind": "text"
}
],
"insertText": "import { foo$1 } from \"./\\\\$foo\";",
"replacementSpan": {
"start": 0,
"length": 8
},
"sourceDisplay": [
{
"text": "./$foo",
"kind": "text"
}
],
"isSnippet": true,
"isImportStatementCompletion": true,
"data": {
"exportName": "foo",
"moduleSpecifier": "./$foo",
"fileName": "/tests/cases/fourslash/$foo.ts"
},
"displayParts": [
{
"text": "function",
"kind": "keyword"
},
{
"text": " ",
"kind": "space"
},
{
"text": "foo",
"kind": "functionName"
},
{
"text": "(",
"kind": "punctuation"
},
{
"text": ")",
"kind": "punctuation"
},
{
"text": ":",
"kind": "punctuation"
},
{
"text": " ",
"kind": "space"
},
{
"text": "void",
"kind": "keyword"
}
],
"documentation": []
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
}
]
}
}
]
14 changes: 14 additions & 0 deletions tests/cases/fourslash/importStatementCompletions3.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/// <reference path="fourslash.ts" />

// @Filename: ./$foo.ts
////export function foo() {}

// @Filename: ./bar.ts
////import f/**/

verify.baselineCompletions({
includeCompletionsForImportStatements: true,
includeCompletionsForModuleExports: true,
includeCompletionsWithSnippetText: true,
includeCompletionsWithInsertText: true
});