Skip to content

Commit bf53c50

Browse files
authored
refactor(telemetry): use patch instead of script (#2502)
1 parent d0973e3 commit bf53c50

File tree

3 files changed

+50
-57
lines changed

3 files changed

+50
-57
lines changed

patches/telemetry.patch

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
2+
index ef676bd..4feb98b 100644
3+
--- a/src/vs/platform/telemetry/common/telemetryService.ts
4+
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
5+
@@ -219,3 +219,3 @@ configurationRegistry.registerConfiguration({
6+
'markdownDescription': getTelemetryLevelSettingDescription(),
7+
- 'default': TelemetryConfiguration.ON,
8+
+ 'default': TelemetryConfiguration.OFF,
9+
'restricted': true,
10+
@@ -245,3 +245,3 @@ configurationRegistry.registerConfiguration({
11+
localize('telemetry.enableTelemetryMd', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made. [Read more]({1}) about what we collect and our privacy statement.", product.nameLong, product.privacyStatementUrl),
12+
- 'default': true,
13+
+ 'default': false,
14+
'restricted': true,
15+
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
16+
index d09ab3f..f37edd6 100644
17+
--- a/src/vs/workbench/browser/workbench.contribution.ts
18+
+++ b/src/vs/workbench/browser/workbench.contribution.ts
19+
@@ -496,3 +496,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
20+
'description': localize('enableNaturalLanguageSearch', "Controls whether the command palette should include similar commands. You must have an extension installed that provides Natural Language support."),
21+
- 'default': true
22+
+ 'default': false
23+
},
24+
diff --git a/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.ts b/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.ts
25+
index 16fd396..587e1e3 100644
26+
--- a/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.ts
27+
+++ b/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.ts
28+
@@ -28,3 +28,3 @@ configurationRegistry.registerConfiguration({
29+
type: 'boolean',
30+
- default: true,
31+
+ default: false,
32+
tags: ['experimental'],
33+
diff --git a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
34+
index e5cec6f..9c9e169 100644
35+
--- a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
36+
+++ b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
37+
@@ -113,3 +113,3 @@ registry.registerConfiguration({
38+
'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings. The natural language search is provided by a Microsoft online service."),
39+
- 'default': true,
40+
+ 'default': false,
41+
'scope': ConfigurationScope.WINDOW,
42+
diff --git a/src/vs/workbench/electron-browser/desktop.contribution.ts b/src/vs/workbench/electron-browser/desktop.contribution.ts
43+
index 3517cc1..7b365fa 100644
44+
--- a/src/vs/workbench/electron-browser/desktop.contribution.ts
45+
+++ b/src/vs/workbench/electron-browser/desktop.contribution.ts
46+
@@ -342,3 +342,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri
47+
'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."),
48+
- 'default': true,
49+
+ 'default': false,
50+
'tags': ['usesOnlineServices', 'telemetry'],

prepare_vscode.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ cp -f LICENSE vscode/LICENSE.txt
1616

1717
cd vscode || { echo "'vscode' dir not found"; exit 1; }
1818

19-
../update_settings.sh
20-
2119
# apply patches
2220
{ set +x; } 2>/dev/null
2321

update_settings.sh

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)