diff options
Diffstat (limited to 'ripgrep.patch')
| -rw-r--r-- | ripgrep.patch | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/ripgrep.patch b/ripgrep.patch index 486d1fd..1f41366 100644 --- a/ripgrep.patch +++ b/ripgrep.patch @@ -52,18 +52,6 @@ index 68f6989f27a..1802c43acfb 100644 import * as Parser from 'tree-sitter'; const { typescript } = require('tree-sitter-typescript'); const product = require('../../product.json'); -diff --git a/package.json b/package.json -index 2103fe1fe1a..fcb42f433a0 100644 ---- vscode/package.json -+++ vscode/package.json -@@ -74,7 +74,6 @@ - "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/policy-watcher": "^1.1.4", - "@vscode/proxy-agent": "^0.21.0", -- "@vscode/ripgrep": "^1.15.9", - "@vscode/spdlog": "^0.15.0", - "@vscode/sqlite3": "5.1.6-vscode", - "@vscode/sudo-prompt": "9.3.1", diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts index f833061c553..de0a5fa7df2 100644 --- vscode/src/vs/workbench/services/search/node/ripgrepFileSearch.ts @@ -90,23 +78,35 @@ index 4740a661119..8bcabe088e2 100644 import { anchorGlob, createTextSearchResult, IOutputChannel, Maybe } from './ripgrepSearchUtils'; import type { RipgrepTextSearchOptions } from 'vs/workbench/services/search/common/searchExtTypesInternal'; +diff --git a/package.json b/package.json +index 9a2065fa14c..128f289dbe4 100644 +--- vscode/package.json ++++ vscode/package.json +@@ -74,7 +74,6 @@ + "@vscode/iconv-lite-umd": "0.7.0", + "@vscode/policy-watcher": "^1.1.4", + "@vscode/proxy-agent": "^0.22.0", +- "@vscode/ripgrep": "^1.15.9", + "@vscode/spdlog": "^0.15.0", + "@vscode/sqlite3": "5.1.6-vscode", + "@vscode/sudo-prompt": "9.3.1", diff --git a/remote/package.json b/remote/package.json -index 5b0e80182ea..a88c2f5d41d 100644 +index 48b849c5928..b9616c172d0 100644 --- vscode/remote/package.json +++ vscode/remote/package.json @@ -9,7 +9,6 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/proxy-agent": "^0.21.0", + "@vscode/proxy-agent": "^0.22.0", - "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", "@vscode/vscode-languagedetection": "1.0.21", "@vscode/windows-process-tree": "^0.6.0", -diff --git a/yarn.lock b/yarn.lock -index 71aef4295fa..7b74e981e61 100644 ---- vscode/yarn.lock -+++ vscode/yarn.lock -@@ -1584,15 +1584,6 @@ +diff --git a/remote/yarn.lock b/remote/yarn.lock +index 38f916a284e..b059a2031c9 100644 +--- vscode/remote/yarn.lock ++++ vscode/remote/yarn.lock +@@ -80,15 +80,6 @@ optionalDependencies: "@vscode/windows-ca-certs" "^0.3.1" @@ -122,22 +122,14 @@ index 71aef4295fa..7b74e981e61 100644 "@vscode/spdlog@^0.15.0": version "0.15.0" resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.15.0.tgz#37896541410ff036dc01c54e16bf131c522a057e" -@@ -1620,7 +1611,6 @@ - resolved "https://registry.yarnpkg.com/@vscode/telemetry-extractor/-/telemetry-extractor-1.10.2.tgz#b1ec2296dac1923d400bf98b3242d9b7d792fe83" - integrity sha512-hn+KDSwIRj7LzDSFd9HALkc80UY1g16nQgWztHml+nxAZU3Hw/EoWEEDxOncvDYq9YcV+tX/cVHrVjbNL2Dg0g== - dependencies: -- "@vscode/ripgrep" "^1.15.9" - command-line-args "^5.2.1" - ts-morph "^19.0.0" - -diff --git a/remote/yarn.lock b/remote/yarn.lock -index c8e84fc81e1..41219df5f33 100644 ---- vscode/remote/yarn.lock -+++ vscode/remote/yarn.lock -@@ -80,15 +80,6 @@ +diff --git a/yarn.lock b/yarn.lock +index 107fdd0e0ec..0a0b5e0edb5 100644 +--- vscode/yarn.lock ++++ vscode/yarn.lock +@@ -1579,15 +1579,6 @@ optionalDependencies: "@vscode/windows-ca-certs" "^0.3.1" - + -"@vscode/ripgrep@^1.15.9": - version "1.15.9" - resolved "https://registry.yarnpkg.com/@vscode/ripgrep/-/ripgrep-1.15.9.tgz#92279f7f28e1e49ad9a89603e10b17a4c7f9f5f1" @@ -150,3 +142,10 @@ index c8e84fc81e1..41219df5f33 100644 "@vscode/spdlog@^0.15.0": version "0.15.0" resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.15.0.tgz#37896541410ff036dc01c54e16bf131c522a057e" +@@ -1615,7 +1606,6 @@ + resolved "https://registry.yarnpkg.com/@vscode/telemetry-extractor/-/telemetry-extractor-1.10.2.tgz#b1ec2296dac1923d400bf98b3242d9b7d792fe83" + integrity sha512-hn+KDSwIRj7LzDSFd9HALkc80UY1g16nQgWztHml+nxAZU3Hw/EoWEEDxOncvDYq9YcV+tX/cVHrVjbNL2Dg0g== + dependencies: +- "@vscode/ripgrep" "^1.15.9" + command-line-args "^5.2.1" + ts-morph "^19.0.0" |