archived/coc-tsserver
1
0
Fork 0
Code Issues Pull requests Activity

fix snippet not work with optional property

Browse source
This commit is contained in:
Qiming Zhao 2022-09-12 12:09:05 +08:00
parent cf463c29ef
commit 528209b91c
No known key found for this signature in database
GPG key ID: 9722CD0E8D4DCB8C
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/server/features/completionItemProvider.ts
View file

@ -225,8 +225,6 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
let { uri, position, source, name, data } = item.data
const filepath = this.client.toPath(uri)
if (!filepath) return undefined
let document = workspace.getDocument(uri)
if (!document) return undefined
const args: Proto.CompletionDetailsRequestArgs = {
...typeConverters.Position.toFileLocationRequestArgs(
filepath,
@ -259,11 +257,10 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
item.additionalTextEdits = additionalTextEdits
if (detail && item.insertTextFormat == InsertTextFormat.Snippet) {
const shouldCompleteFunction = await this.isValidFunctionCompletionContext(filepath, position, token)
if (shouldCompleteFunction && !item.insertText) {
if (shouldCompleteFunction) {
this.createSnippetOfFunctionCall(item, detail)
}
}
return item
}
@ -380,7 +377,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
let { displayParts } = detail
const parameterListParts = getParameterListParts(displayParts)
const snippet = new SnippetString()
snippet.appendText(`${item.insertText || item.label}(`)
snippet.appendText(`${item.insertText ?? item.label}(`)
appendJoinedPlaceholders(snippet, parameterListParts.parts, ', ')
if (parameterListParts.hasOptionalParameters) {
snippet.appendTabstop()