diff --git a/build/package-lock.json b/build/package-lock.json index d3d02a29d7d..626ec828a5b 100644 --- a/build/package-lock.json +++ b/build/package-lock.json @@ -42,7 +42,7 @@ "@types/workerpool": "^6.4.0", "@types/xml2js": "0.0.33", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/ripgrep": "^1.15.10", + "@vscode/ripgrep": "^1.15.13", "@vscode/vsce": "2.20.1", "byline": "^5.0.0", "debug": "^4.3.2", @@ -1319,9 +1319,9 @@ "dev": true }, "node_modules/@vscode/ripgrep": { - "version": "1.15.10", - "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.10.tgz", - "integrity": "sha512-83Q6qFrELpFgf88bPOcwSWDegfY2r/cb6bIfdLTSZvN73Dg1wviSfO+1v6lTFMd0mAvUYYcTUu+Mn5xMroZMxA==", + "version": "1.15.13", + "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.13.tgz", + "integrity": "sha512-c62On5sLEIMv9yfetIZ8c0Mg0s6lvq54G0YLW2zY/XiPsJPyBBgrP54MR1s0hK3gsPy423cY+e2BDU6mOB2Yaw==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/build/package.json b/build/package.json index c19196d45c7..e34a23547ec 100644 --- a/build/package.json +++ b/build/package.json @@ -36,7 +36,7 @@ "@types/workerpool": "^6.4.0", "@types/xml2js": "0.0.33", "@vscode/iconv-lite-umd": "0.7.0", - "@vscode/ripgrep": "^1.15.10", + "@vscode/ripgrep": "^1.15.13", "@vscode/vsce": "2.20.1", "byline": "^5.0.0", "debug": "^4.3.2", diff --git a/package-lock.json b/package-lock.json index 3bb7fc3d2e8..82c97ab56f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.3.2", "@vscode/proxy-agent": "^0.32.0", - "@vscode/ripgrep": "^1.15.11", + "@vscode/ripgrep": "^1.15.13", "@vscode/spdlog": "^0.15.2", "@vscode/sqlite3": "5.1.8-vscode", "@vscode/sudo-prompt": "9.3.1", @@ -2712,9 +2712,9 @@ } }, "node_modules/@vscode/ripgrep": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.11.tgz", - "integrity": "sha512-G/VqtA6kR50mJkIH4WA+I2Q78V5blovgPPq0VPYM0QIRp57lYMkdV+U9VrY80b3AvaC72A1z8STmyxc8ZKiTsw==", + "version": "1.15.13", + "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.13.tgz", + "integrity": "sha512-c62On5sLEIMv9yfetIZ8c0Mg0s6lvq54G0YLW2zY/XiPsJPyBBgrP54MR1s0hK3gsPy423cY+e2BDU6mOB2Yaw==", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index d78d007e580..950cc277386 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@vscode/iconv-lite-umd": "0.7.0", "@vscode/policy-watcher": "^1.3.2", "@vscode/proxy-agent": "^0.32.0", - "@vscode/ripgrep": "^1.15.11", + "@vscode/ripgrep": "^1.15.13", "@vscode/spdlog": "^0.15.2", "@vscode/sqlite3": "5.1.8-vscode", "@vscode/sudo-prompt": "9.3.1", diff --git a/remote/package-lock.json b/remote/package-lock.json index 22cf60e74b7..9efb43a4180 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -14,7 +14,7 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/proxy-agent": "^0.32.0", - "@vscode/ripgrep": "^1.15.11", + "@vscode/ripgrep": "^1.15.13", "@vscode/spdlog": "^0.15.2", "@vscode/tree-sitter-wasm": "^0.1.4", "@vscode/vscode-languagedetection": "1.0.21", @@ -437,9 +437,9 @@ } }, "node_modules/@vscode/ripgrep": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.11.tgz", - "integrity": "sha512-G/VqtA6kR50mJkIH4WA+I2Q78V5blovgPPq0VPYM0QIRp57lYMkdV+U9VrY80b3AvaC72A1z8STmyxc8ZKiTsw==", + "version": "1.15.13", + "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.13.tgz", + "integrity": "sha512-c62On5sLEIMv9yfetIZ8c0Mg0s6lvq54G0YLW2zY/XiPsJPyBBgrP54MR1s0hK3gsPy423cY+e2BDU6mOB2Yaw==", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/remote/package.json b/remote/package.json index 8eefceeca6d..6a6fe3dfff4 100644 --- a/remote/package.json +++ b/remote/package.json @@ -9,7 +9,7 @@ "@vscode/deviceid": "^0.1.1", "@vscode/iconv-lite-umd": "0.7.0", "@vscode/proxy-agent": "^0.32.0", - "@vscode/ripgrep": "^1.15.11", + "@vscode/ripgrep": "^1.15.13", "@vscode/spdlog": "^0.15.2", "@vscode/tree-sitter-wasm": "^0.1.4", "@vscode/vscode-languagedetection": "1.0.21", diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts index 85ef0f3dbc7..da33ca6c132 100644 --- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts +++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ import assert from 'assert'; -import * as path from '../../../../../base/common/path.js'; import { CancellationTokenSource } from '../../../../../base/common/cancellation.js'; import * as glob from '../../../../../base/common/glob.js'; -import { URI } from '../../../../../base/common/uri.js'; -import { deserializeSearchError, IFolderQuery, ISearchRange, ITextQuery, ITextSearchContext, ITextSearchMatch, QueryType, SearchErrorCode, ISerializedFileMatch } from '../../common/search.js'; -import { TextSearchEngineAdapter } from '../../node/textSearchAdapter.js'; -import { flakySuite } from '../../../../../base/test/node/testUtils.js'; import { FileAccess } from '../../../../../base/common/network.js'; +import * as path from '../../../../../base/common/path.js'; +import { URI } from '../../../../../base/common/uri.js'; +import { flakySuite } from '../../../../../base/test/node/testUtils.js'; +import { deserializeSearchError, IFolderQuery, ISearchRange, ISerializedFileMatch, ITextQuery, ITextSearchContext, ITextSearchMatch, QueryType, SearchErrorCode } from '../../common/search.js'; +import { TextSearchEngineAdapter } from '../../node/textSearchAdapter.js'; const TEST_FIXTURES = path.normalize(FileAccess.asFileUri('vs/workbench/services/search/test/node/fixtures').fsPath); const EXAMPLES_FIXTURES = path.join(TEST_FIXTURES, 'examples'); @@ -405,7 +405,7 @@ flakySuite('TextSearch-integration', function () { throw new Error('expected fail'); }, err => { const searchError = deserializeSearchError(err); - const regexParseErrorForLookAround = 'Regex parse error: lookbehind assertion is not fixed length'; + const regexParseErrorForLookAround = 'Regex parse error: length of lookbehind assertion is not limited'; assert.strictEqual(searchError.message, regexParseErrorForLookAround); assert.strictEqual(searchError.code, SearchErrorCode.regexParseError); });