From 0de1698e15c0fc3c4f10f597f91e5d781f49cddc Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sat, 8 Mar 2025 21:31:24 +0100 Subject: [PATCH] feat: update patch and data (#2247) --- patches/terminal-suggest.patch | 54 +++++----------------------------- product.json | 24 ++++++--------- upstream/stable.json | 4 +-- 3 files changed, 18 insertions(+), 64 deletions(-) diff --git a/patches/terminal-suggest.patch b/patches/terminal-suggest.patch index 7b0334d..3509f7b 100644 --- a/patches/terminal-suggest.patch +++ b/patches/terminal-suggest.patch @@ -1,6 +1,6 @@ diff --git a/extensions/terminal-suggest/src/completions/codium-insiders.ts b/extensions/terminal-suggest/src/completions/codium-insiders.ts new file mode 100644 -index 00000000000..a5769b1a575 +index 0000000..a5769b1 --- /dev/null +++ b/extensions/terminal-suggest/src/completions/codium-insiders.ts @@ -0,0 +1,9 @@ @@ -15,7 +15,7 @@ index 00000000000..a5769b1a575 +export default codiumInsidersCompletionSpec; diff --git a/extensions/terminal-suggest/src/completions/codium.ts b/extensions/terminal-suggest/src/completions/codium.ts new file mode 100644 -index 00000000000..b1fa81231fd +index 0000000..b1fa812 --- /dev/null +++ b/extensions/terminal-suggest/src/completions/codium.ts @@ -0,0 +1,9 @@ @@ -29,56 +29,16 @@ index 00000000000..b1fa81231fd + +export default codiumCompletionSpec; diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts -index 3cd5854ca74..e0b7596b0b7 100644 +index 3f181bc..34054ed 100644 --- a/extensions/terminal-suggest/src/terminalSuggestMain.ts +++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts -@@ -10,6 +10,8 @@ import { upstreamSpecs } from './constants'; - import codeCompletionSpec from './completions/code'; - import cdSpec from './completions/cd'; +@@ -12,2 +12,4 @@ import codeCompletionSpec from './completions/code'; import codeInsidersCompletionSpec from './completions/code-insiders'; +import codiumCompletionSpec from './completions/codium'; +import codiumInsidersCompletionSpec from './completions/codium-insiders'; - import { osIsWindows } from './helpers/os'; - import { isExecutable } from './helpers/executable'; - -@@ -28,6 +30,8 @@ export const availableSpecs: Fig.Spec[] = [ - cdSpec, - codeInsidersCompletionSpec, + import setLocationSpec from './completions/set-location'; +@@ -52,2 +54,4 @@ export const availableSpecs: Fig.Spec[] = [ codeCompletionSpec, + codiumInsidersCompletionSpec, + codiumCompletionSpec, - ]; - for (const spec of upstreamSpecs) { - availableSpecs.push(require(`./completions/upstream/${spec}`).default); -diff --git a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts -index d72996b8f70..7c5fb26f925 100644 ---- a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts -+++ b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts -@@ -10,6 +10,8 @@ import { asArray, getCompletionItemsFromSpecs } from '../terminalSuggestMain'; - import cdSpec from '../completions/cd'; - import codeCompletionSpec from '../completions/code'; - import codeInsidersCompletionSpec from '../completions/code-insiders'; -+import codiumCompletionSpec from '../completions/codium'; -+import codiumInsidersCompletionSpec from '../completions/codium-insiders'; - import type { Uri } from 'vscode'; - import { basename } from 'path'; - -@@ -128,6 +130,18 @@ const testSpecs2: ISuiteSpec[] = [ - completionSpecs: codeInsidersCompletionSpec, - availableCommands: 'code-insiders', - testSpecs: createCodeTestSpecs('code-insiders') -+ }, -+ { -+ name: 'codium', -+ completionSpecs: codiumCompletionSpec, -+ availableCommands: 'codium', -+ testSpecs: createCodeTestSpecs('codium') -+ }, -+ { -+ name: 'codium-insiders', -+ completionSpecs: codiumInsidersCompletionSpec, -+ availableCommands: 'codium-insiders', -+ testSpecs: createCodeTestSpecs('codium-insiders') - } - ]; - + setLocationSpec, diff --git a/product.json b/product.json index 45fc0e2..a3401ca 100644 --- a/product.json +++ b/product.json @@ -205,14 +205,10 @@ "treeViewMarkdownMessage" ], "GitHub.copilot": [ - "inlineCompletionsAdditions", - "interactive", - "terminalDataWriteEvent" + "inlineCompletionsAdditions" ], "GitHub.copilot-nightly": [ - "inlineCompletionsAdditions", - "interactive", - "terminalDataWriteEvent" + "inlineCompletionsAdditions" ], "GitHub.copilot-chat": [ "interactive", @@ -220,13 +216,13 @@ "terminalExecuteCommandEvent", "terminalSelection", "terminalQuickFixProvider", - "chatProvider", "chatParticipantAdditions", "defaultChatParticipant", "embeddings", + "chatEditing", + "chatProvider", "mappedEditsProvider", "aiRelatedInformation", - "chatEditing", "codeActionAI", "findTextInFiles", "textSearchProvider", @@ -242,9 +238,9 @@ "chatReferenceDiagnostic", "extensionsAny", "authLearnMore", - "chatReadonlyPromptReference", "testObserver", "aiTextSearchProvider", + "chatReadonlyPromptReference", "documentFiltersExclusive", "chatParticipantPrivate", "contribDebugCreateConfiguration", @@ -269,9 +265,6 @@ "textSearchProvider", "timeline" ], - "GitHub.copilot-nes": [ - "inlineEdit" - ], "ms-python.gather": [ "notebookCellExecutionState" ], @@ -317,6 +310,7 @@ "terminalDataWriteEvent", "chatParticipantAdditions" ], + "vscjava.vscode-java-pack": [], "ms-dotnettools.csdevkit": [ "inlineCompletionsAdditions" ], @@ -335,13 +329,13 @@ "chatParticipantAdditions", "languageModelSystem" ], + "ms-toolsai.datawrangler": [], + "ms-vscode.vscode-commander": [], + "ms-vscode.vscode-websearchforcopilot": [], "ms-vscode.vscode-copilot-vision": [ "chatReferenceBinaryData", "codeActionAI" ], - "lramos15.model-playground": [ - "chatProvider" - ], "ms-autodev.vscode-autodev": [ "chatParticipantAdditions" ], diff --git a/upstream/stable.json b/upstream/stable.json index d620ad6..2e96ace 100644 --- a/upstream/stable.json +++ b/upstream/stable.json @@ -1,4 +1,4 @@ { - "tag": "1.97.2", - "commit": "e54c774e0add60467559eb0d1e229c6452cf8447" + "tag": "1.98.0", + "commit": "6609ac3d66f4eade5cf376d1cb76f13985724bcb" }