Skip to content

Commit b1cbc57

Browse files
jriekenjrieken
committed
Merge branch 'main' into joh/swc
2 parents cf2cb80 + e4f7f6a commit b1cbc57

File tree

159 files changed

+1860
-896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+1860
-896
lines changed

‎.github/workflows/pr-chat.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
main:
88
runs-on: ubuntu-latest
9+
if: ${{ !github.event.pull_request.draft }}
910
steps:
1011
- name: Checkout Actions
1112
uses: actions/checkout@v2

‎build/lib/builtInExtensions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function writeControlFile(control) {
9797
fs.writeFileSync(controlFilePath, JSON.stringify(control, null, 2));
9898
}
9999
function getBuiltInExtensions() {
100-
log('Syncronizing built-in extensions...');
100+
log('Synchronizing built-in extensions...');
101101
log(`You can manage built-in extensions with the ${ansiColors.cyan('--builtin')} flag`);
102102
const control = readControlFile();
103103
const streams = [];

‎build/lib/builtInExtensions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function writeControlFile(control: IControlFile): void {
136136
}
137137

138138
export function getBuiltInExtensions(): Promise<void> {
139-
log('Syncronizing built-in extensions...');
139+
log('Synchronizing built-in extensions...');
140140
log(`You can manage built-in extensions with the ${ansiColors.cyan('--builtin')} flag`);
141141

142142
const control = readControlFile();

‎build/lib/i18n.resources.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"project": "vscode-workbench"
120120
},
121121
{
122-
"name": "vs/workbench/contrib/localizations",
122+
"name": "vs/workbench/contrib/localization",
123123
"project": "vscode-workbench"
124124
},
125125
{

‎extensions/git/src/commands.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ export class CommandCenter {
416416
if (!url) {
417417
/* __GDPR__
418418
"clone" : {
419+
"owner": "lszomoru",
419420
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
420421
}
421422
*/
@@ -441,6 +442,7 @@ export class CommandCenter {
441442
if (!uris || uris.length === 0) {
442443
/* __GDPR__
443444
"clone" : {
445+
"owner": "lszomoru",
444446
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
445447
}
446448
*/
@@ -499,6 +501,7 @@ export class CommandCenter {
499501

500502
/* __GDPR__
501503
"clone" : {
504+
"owner": "lszomoru",
502505
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
503506
"openFolder": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
504507
}
@@ -518,6 +521,7 @@ export class CommandCenter {
518521
if (/already exists and is not an empty directory/.test(err && err.stderr || '')) {
519522
/* __GDPR__
520523
"clone" : {
524+
"owner": "lszomoru",
521525
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
522526
}
523527
*/
@@ -527,6 +531,7 @@ export class CommandCenter {
527531
} else {
528532
/* __GDPR__
529533
"clone" : {
534+
"owner": "lszomoru",
530535
"outcome" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
531536
}
532537
*/
@@ -2920,6 +2925,7 @@ export class CommandCenter {
29202925

29212926
/* __GDPR__
29222927
"git.command" : {
2928+
"owner": "lszomoru",
29232929
"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
29242930
}
29252931
*/

‎extensions/git/src/main.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ export async function _activate(context: ExtensionContext): Promise<GitExtension
192192
outputChannelLogger.logWarning(err.message);
193193

194194
/* __GDPR__
195-
"git.missing" : {}
195+
"git.missing" : {
196+
"owner": "lszomoru"
197+
}
196198
*/
197199
telemetryReporter.sendTelemetryEvent('git.missing');
198200

‎extensions/git/src/repository.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,6 +1864,7 @@ export class Repository implements Disposable {
18641864
if (didHitLimit) {
18651865
/* __GDPR__
18661866
"statusLimit" : {
1867+
"owner": "lszomoru",
18671868
"ignoreSubmodules": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
18681869
"limit": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
18691870
"statusLength": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }

‎extensions/github-authentication/src/githubServer.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ export class GitHubServer implements IGitHubServer {
496496

497497
/* __GDPR__
498498
"session" : {
499+
"owner": "TylerLeonhardt",
499500
"isEdu": { "classification": "NonIdentifiableDemographicInfo", "purpose": "FeatureInsight" }
500501
}
501502
*/
@@ -530,6 +531,7 @@ export class GitHubServer implements IGitHubServer {
530531

531532
/* __GDPR__
532533
"ghe-session" : {
534+
"owner": "TylerLeonhardt",
533535
"version": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
534536
}
535537
*/
@@ -601,6 +603,7 @@ export class GitHubEnterpriseServer implements IGitHubServer {
601603

602604
/* __GDPR__
603605
"ghe-session" : {
606+
"owner": "TylerLeonhardt",
604607
"version": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
605608
}
606609
*/

‎extensions/html-language-features/server/build/javaScriptLibraryLoader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = function () {
3131
queue.push(name);
3232
};
3333

34-
enqueue('es6');
34+
enqueue('es2020.full');
3535

3636
var result = [];
3737
while (queue.length > 0) {

‎extensions/html-language-features/server/src/modes/javascriptLibs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function loadLibrary(name: string) {
2424
try {
2525
content = readFileSync(libPath).toString();
2626
} catch (e) {
27-
console.log(`Unable to load library ${name} at ${libPath}: ${e.message}`);
27+
console.log(`Unable to load library ${name} at ${libPath}`);
2828
content = '';
2929
}
3030
contents[name] = content;

0 commit comments

Comments
 (0)