Skip to content

Commit 1466122

Browse files
authored
Clean up for workspacetags (microsoft#135746)
1 parent e3ce1fe commit 1466122

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ const ModulesToLookFor = [
3838
'hapi',
3939
'socket.io',
4040
'restify',
41+
'next',
42+
'nuxt',
43+
'@nestjs/core',
44+
'strapi',
45+
'gatsby',
4146
// JS frameworks
4247
'react',
4348
'react-native',
@@ -48,6 +53,7 @@ const ModulesToLookFor = [
4853
'@ionic',
4954
'vue',
5055
'tns-core-modules',
56+
'@nativescript/core',
5157
'electron',
5258
// Other interesting packages
5359
'aws-sdk',
@@ -297,6 +303,8 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
297303
"workspace.grunt" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
298304
"workspace.gulp" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
299305
"workspace.jake" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
306+
"workspace.devcontainer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
307+
"workspace.docker" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
300308
"workspace.tsconfig" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
301309
"workspace.jsconfig" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
302310
"workspace.config.xml" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -311,6 +319,11 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
311319
"workspace.npm.hapi" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
312320
"workspace.npm.socket.io" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
313321
"workspace.npm.restify" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
322+
"workspace.npm.next" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
323+
"workspace.npm.nuxt" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
324+
"workspace.npm.@nestjs/core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
325+
"workspace.npm.strapi" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
326+
"workspace.npm.gatsby" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
314327
"workspace.npm.rnpm-plugin-windows" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
315328
"workspace.npm.react" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
316329
"workspace.npm.@angular/core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -566,6 +579,8 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
566579
tags['workspace.grunt'] = nameSet.has('gruntfile.js');
567580
tags['workspace.gulp'] = nameSet.has('gulpfile.js');
568581
tags['workspace.jake'] = nameSet.has('jakefile.js');
582+
tags['workspace.devcontainer'] = nameSet.has('devcontainer.json');
583+
tags['workspace.docker'] = nameSet.has('Dockerfile') || nameSet.has('docker-compose.yml');
569584

570585
tags['workspace.tsconfig'] = nameSet.has('tsconfig.json');
571586
tags['workspace.jsconfig'] = nameSet.has('jsconfig.json');
@@ -696,9 +711,9 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
696711
let dependencies = Object.keys(packageJsonContents['dependencies'] || {}).concat(Object.keys(packageJsonContents['devDependencies'] || {}));
697712

698713
for (let dependency of dependencies) {
699-
if ('react-native' === dependency) {
714+
if (dependency.startsWith('react-native')) {
700715
tags['workspace.reactNative'] = true;
701-
} else if ('tns-core-modules' === dependency) {
716+
} else if ('tns-core-modules' === dependency || '@nativescript/core' === dependency) {
702717
tags['workspace.nativescript'] = true;
703718
} else if (ModulesToLookFor.indexOf(dependency) > -1) {
704719
tags['workspace.npm.' + dependency] = true;
@@ -755,6 +770,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
755770
// Ignore errors when resolving android
756771
});
757772
});
773+
758774
return Promise.all([...packageJsonPromises, ...requirementsTxtPromises, ...pipfilePromises, ...pomPromises, ...gradlePromises, ...androidPromises]).then(() => tags);
759775
});
760776
}

0 commit comments

Comments
 (0)