Projects
home:Eustace:branches:Eulaceura:Factory
vscodium
_service:obs_scm:ripgrep.patch
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:obs_scm:ripgrep.patch of Package vscodium
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 9dfb6a3848c..7a27a8b5745 100644 --- vscode/build/gulpfile.vscode.js +++ vscode/build/gulpfile.vscode.js @@ -370,7 +370,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op .pipe(jsFilter.restore) .pipe(createAsar(path.join(process.cwd(), 'node_modules'), [ '**/*.node', - '**/@vscode/ripgrep/bin/*', '**/node-pty/build/Release/*', '**/node-pty/build/Release/conpty/*', '**/node-pty/lib/worker/conoutSocketWorker.js', diff --git a/build/lib/policies.ts b/build/lib/policies.ts index 68f6989f27a..1802c43acfb 100644 --- vscode/build/lib/policies.ts +++ vscode/build/lib/policies.ts @@ -7,7 +7,7 @@ import { spawn } from 'child_process'; import { promises as fs } from 'fs'; import * as path from 'path'; import * as byline from 'byline'; -import { rgPath } from '@vscode/ripgrep'; +const rgPath = '/usr/bin/rg'; import * as Parser from 'tree-sitter'; const { typescript } = require('tree-sitter-typescript'); const product = require('../../product.json'); diff --git a/package-lock.json b/package-lock.json index 1d73c326d55..4705e2f1be1 100644 --- vscode/package-lock.json +++ vscode/package-lock.json @@ -17,7 +17,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", @@ -2899,26 +2898,6 @@ "@vscode/windows-ca-certs": "^0.3.1" } }, - "node_modules/@vscode/ripgrep": { - "version": "1.15.9", - "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.9.tgz", - "integrity": "sha512-4q2PXRvUvr3bF+LsfrifmUZgSPmCNcUZo6SbEAZgArIChchkezaxLoIeQMJe/z3CCKStvaVKpBXLxN3Z8lQjFQ==", - "hasInstallScript": true, - "dependencies": { - "https-proxy-agent": "^7.0.2", - "proxy-from-env": "^1.1.0", - "yauzl": "^2.9.2" - } - }, - "node_modules/@vscode/ripgrep/node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, "node_modules/@vscode/spdlog": { "version": "0.15.0", "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.0.tgz", @@ -2964,7 +2943,6 @@ "integrity": "sha512-hn+KDSwIRj7LzDSFd9HALkc80UY1g16nQgWztHml+nxAZU3Hw/EoWEEDxOncvDYq9YcV+tX/cVHrVjbNL2Dg0g==", "dev": true, "dependencies": { - "@vscode/ripgrep": "^1.15.9", "command-line-args": "^5.2.1", "ts-morph": "^19.0.0" }, diff --git a/package.json b/package.json index c2060ef2060..1513167f4c6 100644 --- vscode/package.json +++ vscode/package.json @@ -79,7 +79,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-lock.json b/remote/package-lock.json index 58725751af9..0d5f7b75a5b 100644 --- vscode/remote/package-lock.json +++ vscode/remote/package-lock.json @@ -14,7 +14,6 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/proxy-agent": "^0.22.0", - "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", "@vscode/tree-sitter-wasm": "^0.0.4", "@vscode/vscode-languagedetection": "1.0.21", @@ -144,26 +143,6 @@ "@vscode/windows-ca-certs": "^0.3.1" } }, - "node_modules/@vscode/ripgrep": { - "version": "1.15.9", - "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.9.tgz", - "integrity": "sha512-4q2PXRvUvr3bF+LsfrifmUZgSPmCNcUZo6SbEAZgArIChchkezaxLoIeQMJe/z3CCKStvaVKpBXLxN3Z8lQjFQ==", - "hasInstallScript": true, - "dependencies": { - "https-proxy-agent": "^7.0.2", - "proxy-from-env": "^1.1.0", - "yauzl": "^2.9.2" - } - }, - "node_modules/@vscode/ripgrep/node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, "node_modules/@vscode/spdlog": { "version": "0.15.0", "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.0.tgz", diff --git a/remote/package.json b/remote/package.json index c107b048e45..1692341196e 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.22.0", - "@vscode/ripgrep": "^1.15.9", "@vscode/spdlog": "^0.15.0", "@vscode/tree-sitter-wasm": "^0.0.4", "@vscode/vscode-languagedetection": "1.0.21", diff --git a/src/vs/platform/cssDev/node/cssDevService.ts b/src/vs/platform/cssDev/node/cssDevService.ts index 6c24e8e0672..db066935154 100644 --- vscode/src/vs/platform/cssDev/node/cssDevService.ts +++ vscode/src/vs/platform/cssDev/node/cssDevService.ts @@ -45,7 +45,7 @@ export class CSSDevelopmentService implements ICSSDevelopmentService { return []; } - const rg = await import('@vscode/ripgrep'); + const rgPath = '/usr/bin/rg'; return await new Promise<string[]>((resolve) => { const sw = StopWatch.create(); @@ -53,7 +53,7 @@ export class CSSDevelopmentService implements ICSSDevelopmentService { const chunks: string[][] = []; const decoder = new TextDecoder(); const basePath = FileAccess.asFileUri('').fsPath; - const process = spawn(rg.rgPath, ['-g', '**/*.css', '--files', '--no-ignore', basePath], {}); + const process = spawn(rgPath, ['-g', '**/*.css', '--files', '--no-ignore', basePath], {}); process.stdout.on('data', data => { const chunk = decoder.decode(data, { stream: true }); diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts index 95aa93b8617..c2a06a0f0f6 100644 --- vscode/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts +++ vscode/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts @@ -96,11 +96,6 @@ flakySuite('Native Modules (all platforms)', () => { assert.ok(typeof deviceIdPackage.getDeviceId === 'function', testErrorMessage('@vscode/deviceid')); }); - test('@vscode/ripgrep', async () => { - const ripgrep = await import('@vscode/ripgrep'); - assert.ok(typeof ripgrep.rgPath === 'string', testErrorMessage('@vscode/ripgrep')); - }); - test('vscode-regexpp', async () => { const regexpp = await import('vscode-regexpp'); assert.ok(typeof regexpp.RegExpParser === 'function', testErrorMessage('vscode-regexpp')); diff --git a/src/vs/workbench/api/common/extHostRequireInterceptor.ts b/src/vs/workbench/api/common/extHostRequireInterceptor.ts index f01e80dd53e..0f627f1071d 100644 --- vscode/src/vs/workbench/api/common/extHostRequireInterceptor.ts +++ vscode/src/vs/workbench/api/common/extHostRequireInterceptor.ts @@ -95,7 +95,6 @@ class NodeModuleAliasingModuleFactory implements IAlternativeModuleProvider { * renamed without breaking extensions. In the form "original -> new name". */ private static readonly aliased: ReadonlyMap<string, string> = new Map([ - ['vscode-ripgrep', '@vscode/ripgrep'], ['vscode-windows-registry', '@vscode/windows-registry'], ]); diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts index 29921d5465a..229c64c9132 100644 --- vscode/src/vs/workbench/services/search/node/ripgrepFileSearch.ts +++ vscode/src/vs/workbench/services/search/node/ripgrepFileSearch.ts @@ -12,7 +12,7 @@ import { isMacintosh as isMac } from '../../../../base/common/platform.js'; import * as strings from '../../../../base/common/strings.js'; import { IFileQuery, IFolderQuery } from '../common/search.js'; import { anchorGlob } from './ripgrepSearchUtils.js'; -import { rgPath } from '@vscode/ripgrep'; +const rgPath = '/usr/bin/rg'; // If @vscode/ripgrep is in an .asar file, then the binary is unpacked. const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.unpacked'); diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts index 3ab8205f2b1..e0ff77cf648 100644 --- vscode/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts +++ vscode/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts @@ -16,7 +16,7 @@ import { Progress } from '../../../../platform/progress/common/progress.js'; import { DEFAULT_MAX_SEARCH_RESULTS, IExtendedExtensionSearchOptions, ITextSearchPreviewOptions, SearchError, SearchErrorCode, serializeSearchError, TextSearchMatch } from '../common/search.js'; import { Range, TextSearchCompleteNew, TextSearchContextNew, TextSearchMatchNew, TextSearchProviderOptions, TextSearchQueryNew, TextSearchResultNew } from '../common/searchExtTypes.js'; import { AST as ReAST, RegExpParser, RegExpVisitor } from 'vscode-regexpp'; -import { rgPath } from '@vscode/ripgrep'; +const rgPath = '/usr/bin/rg'; import { anchorGlob, IOutputChannel, Maybe, rangeToSearchRange, searchRangeToRange } from './ripgrepSearchUtils.js'; import type { RipgrepTextSearchOptions } from '../common/searchExtTypesInternal.js'; import { newToOldPreviewOptions } from '../common/searchExtConversionTypes.js'; diff --git a/undo_telemetry.sh b/undo_telemetry.sh index 3172d05..23fc004 100755 --- undo_telemetry.sh +++ undo_telemetry.sh @@ -30,7 +30,7 @@ d1=$( date +%s ) if [[ "${OS_NAME}" == "linux" ]]; then if [[ ${VSCODE_ARCH} == "x64" ]]; then - ./node_modules/@vscode/ripgrep/bin/rg --no-ignore -l "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}" + /usr/bin/rg --no-ignore -l "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}" else grep -rl --exclude-dir=.git -E "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}" fi
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2