代码拉取完成，页面将自动刷新
同步操作将从 src-openEuler/vscode 强制同步，此操作会覆盖自 Fork 仓库以来所做的任何修改，且无法恢复！！！
确定后同步将在后台操作，完成时将刷新页面，请耐心等待。
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 7841bb90887..06141c497bd 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -377,7 +377,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
if (!isESM('ASAR disabled in VS Code builds')) { // TODO@esm: ASAR disabled in ESM
deps = deps.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
--- a/build/lib/policies.ts
+++ b/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/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
index 21c4236aadc..bbc5a1c3411 100644
--- a/build/linux/dependencies-generator.js
+++ b/build/linux/dependencies-generator.js
@@ -23,7 +23,7 @@ const esm_1 = require("../lib/esm");
// If true, we fail the build if there are new dependencies found during that task.
// The reference dependencies, which one has to update when the new dependencies
// are valid, are in dep-lists.ts
-const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
+const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:chrome/installer/linux/BUILD.gn;l=64-80
// and the Linux Archive build
// Shared library dependencies that we already bundle.
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index 9ca239e3253..d8b55535545 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -122,6 +122,3 @@ for (let dir of dirs) {
yarnInstall(dir, opts);
}
-
-cp.execSync('git config pull.rebase merges');
-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
diff --git a/package.json b/package.json
index 13fc4f4cabe..1ac94531861 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "code-oss-dev",
+ "name": "code",
"version": "1.93.1",
"distro": "2560b0e8d341a0b6734d28ef71b08e1920ff2501",
"author": {
@@ -79,7 +79,6 @@
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/policy-watcher": "^1.1.4",
"@vscode/proxy-agent": "^0.23.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/product.json b/product.json
index 908be250245..686c17bb3f9 100644
--- a/product.json
+++ b/product.json
@@ -1,8 +1,8 @@
{
- "nameShort": "Code - OSS",
- "nameLong": "Code - OSS",
- "applicationName": "code-oss",
- "dataFolderName": ".vscode-oss",
+ "nameShort": "Code",
+ "nameLong": "Code",
+ "applicationName": "code",
+ "dataFolderName": ".vscode",
"win32MutexName": "vscodeoss",
"licenseName": "MIT",
"licenseUrl": "https://github.com/microsoft/vscode/blob/main/LICENSE.txt",
@@ -10,9 +10,9 @@
"serverGreeting": [],
"serverLicense": [],
"serverLicensePrompt": "",
- "serverApplicationName": "code-server-oss",
- "serverDataFolderName": ".vscode-server-oss",
- "tunnelApplicationName": "code-tunnel-oss",
+ "serverApplicationName": "code-Server",
+ "serverDataFolderName": ".vscode-server",
+ "tunnelApplicationName": "code-tunnel",
"win32DirName": "Microsoft Code OSS",
"win32NameVersion": "Microsoft Code OSS",
"win32RegValueName": "CodeOSS",
@@ -25,60 +25,18 @@
"win32TunnelServiceMutex": "vscodeoss-tunnelservice",
"win32TunnelMutex": "vscodeoss-tunnel",
"darwinBundleIdentifier": "com.visualstudio.code.oss",
- "linuxIconName": "code-oss",
+ "linuxIconName": "code",
"licenseFileName": "LICENSE.txt",
"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
"nodejsRepository": "https://nodejs.org",
"urlProtocol": "code-oss",
"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
- "builtInExtensions": [
- {
- "name": "ms-vscode.js-debug-companion",
- "version": "1.1.3",
- "sha256": "7380a890787452f14b2db7835dfa94de538caf358ebc263f9d46dd68ac52de93",
- "repo": "https://github.com/microsoft/vscode-js-debug-companion",
- "metadata": {
- "id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
- "publisherId": {
- "publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
- "publisherName": "ms-vscode",
- "displayName": "Microsoft",
- "flags": "verified"
- },
- "publisherDisplayName": "Microsoft"
- }
- },
- {
- "name": "ms-vscode.js-debug",
- "version": "1.93.0",
- "sha256": "9339cb8e6b77f554df54d79e71f533279cb76b0f9b04c207f633bfd507442b6a",
- "repo": "https://github.com/microsoft/vscode-js-debug",
- "metadata": {
- "id": "25629058-ddac-4e17-abba-74678e126c5d",
- "publisherId": {
- "publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
- "publisherName": "ms-vscode",
- "displayName": "Microsoft",
- "flags": "verified"
- },
- "publisherDisplayName": "Microsoft"
- }
- },
- {
- "name": "ms-vscode.vscode-js-profile-table",
- "version": "1.0.9",
- "sha256": "3b62ee4276a2bbea3fe230f94b1d5edd915b05966090ea56f882e1e0ab53e1a6",
- "repo": "https://github.com/microsoft/vscode-js-profile-visualizer",
- "metadata": {
- "id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb",
- "publisherId": {
- "publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
- "publisherName": "ms-vscode",
- "displayName": "Microsoft",
- "flags": "verified"
- },
- "publisherDisplayName": "Microsoft"
- }
- }
- ]
+ "extensionsGallery": {
+ "serviceUrl": "https://open-vsx.org/vscode/gallery",
+ "itemUrl": "https://open-vsx.org/vscode/item"
+ },
+ "linkProtectionTrustedDomains": [
+ "https://open-vsx.org"
+ ],
+ "builtInExtensions": []
}
diff --git a/remote/package.json b/remote/package.json
index 2fa234e63fc..35cf0b8bfca 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -9,7 +9,6 @@
"@vscode/deviceid": "^0.1.1",
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/proxy-agent": "^0.23.0",
- "@vscode/ripgrep": "^1.15.9",
"@vscode/spdlog": "^0.15.0",
"@vscode/tree-sitter-wasm": "^0.0.2",
"@vscode/vscode-languagedetection": "1.0.21",
diff --git a/remote/yarn.lock b/remote/yarn.lock
index 74b8c01c013..594d57f2bf9 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -80,15 +80,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"
- integrity sha512-4q2PXRvUvr3bF+LsfrifmUZgSPmCNcUZo6SbEAZgArIChchkezaxLoIeQMJe/z3CCKStvaVKpBXLxN3Z8lQjFQ==
- dependencies:
- https-proxy-agent "^7.0.2"
- proxy-from-env "^1.1.0"
- yauzl "^2.9.2"
-
"@vscode/spdlog@^0.15.0":
version "0.15.0"
resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.15.0.tgz#37896541410ff036dc01c54e16bf131c522a057e"
diff --git a/resources/linux/code.appdata.xml b/resources/linux/code.appdata.xml
index ab9df8c25da..3ad4493e142 100644
--- a/resources/linux/code.appdata.xml
+++ b/resources/linux/code.appdata.xml
@@ -5,9 +5,9 @@
<project_license>@@LICENSE@@</project_license>
<name>@@NAME_LONG@@</name>
<url type="homepage">https://code.visualstudio.com</url>
- <summary>Visual Studio Code. Code editing. Redefined.</summary>
+ <summary>Code. Code editing. Redefined.</summary>
<description>
- <p>Visual Studio Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ.</p>
+ <p>Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ.</p>
</description>
<screenshots>
<screenshot type="default">
diff --git a/src/vs/platform/cssDev/node/cssDevService.ts b/src/vs/platform/cssDev/node/cssDevService.ts
index 98e73883207..c6a9f6f1084 100644
--- a/src/vs/platform/cssDev/node/cssDevService.ts
+++ b/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 e9b5ba5c08f..00afd4997ab 100644
--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+++ b/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 bcf03a6a02a..645c2d14090 100644
--- a/src/vs/workbench/api/common/extHostRequireInterceptor.ts
+++ b/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 f833061c553..de0a5fa7df2 100644
--- a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
@@ -12,7 +12,7 @@ import { isMacintosh as isMac } from 'vs/base/common/platform';
import * as strings from 'vs/base/common/strings';
import { IFileQuery, IFolderQuery } from 'vs/workbench/services/search/common/search';
import { anchorGlob } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
-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 72796fe63a8..da6abab0b72 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -16,7 +16,7 @@ import { Progress } from 'vs/platform/progress/common/progress';
import { DEFAULT_MAX_SEARCH_RESULTS, IExtendedExtensionSearchOptions, ITextSearchPreviewOptions, SearchError, SearchErrorCode, serializeSearchError, TextSearchMatch } from 'vs/workbench/services/search/common/search';
import { Range, TextSearchCompleteNew, TextSearchContextNew, TextSearchMatchNew, TextSearchProviderOptions, TextSearchQueryNew, TextSearchResultNew } from 'vs/workbench/services/search/common/searchExtTypes';
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';
import type { RipgrepTextSearchOptions } from 'vs/workbench/services/search/common/searchExtTypesInternal';
import { newToOldPreviewOptions } from 'vs/workbench/services/search/common/searchExtConversionTypes';
diff --git a/yarn.lock b/yarn.lock
index 802b84c1766..d965fe9a7fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1586,15 +1586,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"
- integrity sha512-4q2PXRvUvr3bF+LsfrifmUZgSPmCNcUZo6SbEAZgArIChchkezaxLoIeQMJe/z3CCKStvaVKpBXLxN3Z8lQjFQ==
- dependencies:
- https-proxy-agent "^7.0.2"
- proxy-from-env "^1.1.0"
- yauzl "^2.9.2"
-
"@vscode/spdlog@^0.15.0":
version "0.15.0"
resolved "https://registry.yarnpkg.com/@vscode/spdlog/-/spdlog-0.15.0.tgz#37896541410ff036dc01c54e16bf131c522a057e"
@@ -1622,7 +1613,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"
此处可能存在不合适展示的内容，页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容，可点击提交进行申诉，我们将尽快为您处理。
马建仓 AI 助手