diff --git a/patches/policies.patch b/patches/policies.patch index aedabfb..1d489da 100644 --- a/patches/policies.patch +++ b/patches/policies.patch @@ -50,32 +50,32 @@ index 34d20e9..8404cdf 100644 + diff --git a/eslint.config.js b/eslint.config.js -index 822da54..6236bf0 100644 +index 33165a2..1a9716c 100644 --- a/eslint.config.js +++ b/eslint.config.js -@@ -796,3 +796,3 @@ export default tseslint.config( +@@ -797,3 +797,3 @@ export default tseslint.config( '@vscode/iconv-lite-umd', - '@vscode/policy-watcher', + '@vscodium/policy-watcher', '@vscode/proxy-agent', diff --git a/package-lock.json b/package-lock.json -index 8112caf..682b56a 100644 +index 1649f67..180f21a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,3 +19,2 @@ "@vscode/iconv-lite-umd": "0.7.0", -- "@vscode/policy-watcher": "^1.3.0", +- "@vscode/policy-watcher": "^1.3.1", "@vscode/proxy-agent": "^0.32.0", @@ -30,2 +29,3 @@ "@vscode/windows-registry": "^1.1.0", -+ "@vscodium/policy-watcher": "^1.3.0-2503300035", ++ "@vscodium/policy-watcher": "^1.3.1-2504060125", "@xterm/addon-clipboard": "^0.2.0-beta.82", -@@ -2844,22 +2844,2 @@ +@@ -2714,22 +2714,2 @@ }, - "node_modules/@vscode/policy-watcher": { -- "version": "1.3.0", -- "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.0.tgz", -- "integrity": "sha512-a8pPxlZlMJWOOj2NZ/2ceXgHdDU/NXo+8Pn/InV/sPBfbvTnf/MpMc4pscm9pdU4UIrTGR5+OduQW7mTK8DK7Q==", +- "version": "1.3.1", +- "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.1.tgz", +- "integrity": "sha512-StbJFalUanuWSIeWng0yxu9Rjiyi9BPsvS5UlPqwyRbyA08TLvrM88SHMO2DVfyzMDjwM4MogF8LEUBTvVxS8g==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { @@ -93,12 +93,12 @@ index 8112caf..682b56a 100644 - } - }, "node_modules/@vscode/proxy-agent": { -@@ -3260,2 +3240,22 @@ +@@ -3130,2 +3110,22 @@ }, + "node_modules/@vscodium/policy-watcher": { -+ "version": "1.3.0-2503300035", -+ "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.0-2503300035.tgz", -+ "integrity": "sha512-Vf83Z2uKkq+SL2Kr+DHlE7Ezb+HBnspn5iMazUele1Mj/7WQv0Zq/fTQ3LFKKVC6hV5+G95BXwOc7oSAU0gWUw==", ++ "version": "1.3.1-2504060125", ++ "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.1-2504060125.tgz", ++ "integrity": "sha512-bRNTJOk6GWu1OpisDjmuHTBsVlmIV877XgT/lQ63wUiGxNLkthwhpIhSUCS77JFuwrYuRM+apA0NX+fGUI7WOA==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { @@ -117,13 +117,13 @@ index 8112caf..682b56a 100644 + }, "node_modules/@webassemblyjs/ast": { diff --git a/package.json b/package.json -index add0c27..2e5b5f1 100644 +index 309db0e..d0404fe 100644 --- a/package.json +++ b/package.json @@ -78,3 +78,3 @@ "@vscode/iconv-lite-umd": "0.7.0", -- "@vscode/policy-watcher": "^1.3.0", -+ "@vscodium/policy-watcher": "^1.3.0-2503300035", +- "@vscode/policy-watcher": "^1.3.1", ++ "@vscodium/policy-watcher": "^1.3.1-2504060125", "@vscode/proxy-agent": "^0.32.0", diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt index ee0a24b..881ce36 100644 diff --git a/product.json b/product.json index d84717b..c9ca2ec 100644 --- a/product.json +++ b/product.json @@ -208,10 +208,14 @@ "treeViewMarkdownMessage" ], "GitHub.copilot": [ - "inlineCompletionsAdditions" + "inlineCompletionsAdditions", + "interactive", + "terminalDataWriteEvent" ], "GitHub.copilot-nightly": [ - "inlineCompletionsAdditions" + "inlineCompletionsAdditions", + "interactive", + "terminalDataWriteEvent" ], "GitHub.copilot-chat": [ "interactive", @@ -219,13 +223,13 @@ "terminalExecuteCommandEvent", "terminalSelection", "terminalQuickFixProvider", + "chatProvider", "chatParticipantAdditions", "defaultChatParticipant", "embeddings", - "chatEditing", - "chatProvider", "mappedEditsProvider", "aiRelatedInformation", + "chatEditing", "codeActionAI", "findTextInFiles", "findTextInFiles2", @@ -242,9 +246,9 @@ "chatReferenceDiagnostic", "extensionsAny", "authLearnMore", + "chatReadonlyPromptReference", "testObserver", "aiTextSearchProvider", - "chatReadonlyPromptReference", "documentFiltersExclusive", "chatParticipantPrivate", "contribDebugCreateConfiguration", @@ -271,10 +275,15 @@ "textSearchProvider", "timeline" ], + "GitHub.copilot-nes": [ + "inlineEdit" + ], "ms-python.gather": [ "notebookCellExecutionState" ], - "ms-python.vscode-pylance": [], + "ms-python.vscode-pylance": [ + "terminalShellEnv" + ], "ms-python.debugpy": [ "contribViewsWelcome", "debugVisualization", @@ -299,6 +308,9 @@ "notebookVariableProvider", "notebookReplDocument" ], + "donjayamanne.kusto": [ + "notebookVariableProvider" + ], "ms-toolsai.tensorboard": [ "portsAttributes" ], @@ -316,7 +328,6 @@ "terminalDataWriteEvent", "chatParticipantAdditions" ], - "vscjava.vscode-java-pack": [], "ms-dotnettools.csdevkit": [ "inlineCompletionsAdditions" ], @@ -335,13 +346,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/insider.json b/upstream/insider.json index 7ca91aa..aed4ce1 100644 --- a/upstream/insider.json +++ b/upstream/insider.json @@ -1,4 +1,4 @@ { - "tag": "1.99.0", - "commit": "b34f7ee5b19a94b2aa6982c48a9495f691a8d9f6" + "tag": "1.100.0", + "commit": "c7ea9f8f6c08db68cd63dabe8edfc8555904ee42" }