Skip to content

Commit f8336d1

Browse files
authoredJul 25, 2024
Use spread when converting completion entry to protocol format (#59412)
·
v5.9.2v5.6-rc
1 parent 0c33c13 commit f8336d1

File tree

76 files changed

+5084
-4837
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+5084
-4837
lines changed
 

‎src/server/session.ts‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,45 +2452,13 @@ export class Session<TMessage = string> implements EventSender {
24522452
const prefix = args.prefix || "";
24532453
const entries = mapDefined<CompletionEntry, protocol.CompletionEntry>(completions.entries, entry => {
24542454
if (completions.isMemberCompletion || startsWith(entry.name.toLowerCase(), prefix.toLowerCase())) {
2455-
const {
2456-
name,
2457-
kind,
2458-
kindModifiers,
2459-
sortText,
2460-
insertText,
2461-
filterText,
2462-
replacementSpan,
2463-
hasAction,
2464-
source,
2465-
sourceDisplay,
2466-
labelDetails,
2467-
isSnippet,
2468-
isRecommended,
2469-
isPackageJsonImport,
2470-
isImportStatementCompletion,
2471-
data,
2472-
commitCharacters,
2473-
} = entry;
2474-
const convertedSpan = replacementSpan ? toProtocolTextSpan(replacementSpan, scriptInfo) : undefined;
2455+
const convertedSpan = entry.replacementSpan ? toProtocolTextSpan(entry.replacementSpan, scriptInfo) : undefined;
24752456
// Use `hasAction || undefined` to avoid serializing `false`.
24762457
return {
2477-
name,
2478-
kind,
2479-
kindModifiers,
2480-
sortText,
2481-
insertText,
2482-
filterText,
2458+
...entry,
24832459
replacementSpan: convertedSpan,
2484-
isSnippet,
2485-
hasAction: hasAction || undefined,
2486-
source,
2487-
sourceDisplay,
2488-
labelDetails,
2489-
isRecommended,
2490-
isPackageJsonImport,
2491-
isImportStatementCompletion,
2492-
data,
2493-
commitCharacters,
2460+
hasAction: entry.hasAction || undefined,
2461+
symbol: undefined,
24942462
};
24952463
}
24962464
});

‎tests/baselines/reference/completionsServerCommitCharacters.baseline‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"entries": [
2222
{
2323
"name": "aa",
24-
"kind": "string",
2524
"kindModifiers": "",
25+
"kind": "string",
2626
"sortText": "11",
2727
"replacementSpan": {
2828
"start": 24,
@@ -39,8 +39,8 @@
3939
},
4040
{
4141
"name": "bb",
42-
"kind": "string",
4342
"kindModifiers": "",
43+
"kind": "string",
4444
"sortText": "11",
4545
"replacementSpan": {
4646
"start": 24,

0 commit comments

Comments
 (0)
Please sign in to comment.