Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into smoketest

Browse Source
This commit is contained in:
Joao Moreno
2017-10-10 09:19:17 +02:00
parent 94fb905f00 4ceb914218
commit a4c647f62f
134 changed files with 8031 additions and 7632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/smoke/package.json
+7 -7
View File
@@ -9,13 +9,13 @@
},
"devDependencies": {
"@types/electron": "~1.4.37",
"@types/htmlparser2": "^3.7.29",
"@types/mkdirp": "^0.5.1",
"@types/mocha": "^2.2.41",
"@types/ncp": "^2.0.1",
"@types/node": "^8.0.26",
"@types/rimraf": "^2.0.2",
"@types/webdriverio": "^4.6.1",
"@types/htmlparser2": "3.7.29",
"@types/mkdirp": "0.5.1",
"@types/mocha": "2.2.41",
"@types/ncp": "2.0.1",
"@types/node": "8.0.33",
"@types/rimraf": "2.0.2",
"@types/webdriverio": "4.6.1",
"htmlparser2": "^3.9.2",
"mkdirp": "^0.5.1",
"mocha": "^3.2.0",
test/smoke/src/areas/explorer/explorer.ts
+3 -3
View File
@@ -32,11 +32,11 @@ export class Explorer extends Viewlet {
public getExtensionSelector(fileName: string): string {
const extension = fileName.split('.')[1];
if (extension === 'js') {
return 'js-ext-file-icon javascript-lang-file-icon';
return 'js-ext-file-icon ext-file-icon javascript-lang-file-icon';
} else if (extension === 'json') {
return 'json-ext-file-icon json-lang-file-icon';
return 'json-ext-file-icon ext-file-icon json-lang-file-icon';
} else if (extension === 'md') {
return 'md-ext-file-icon markdown-lang-file-icon';
return 'md-ext-file-icon ext-file-icon markdown-lang-file-icon';
}
throw new Error('No class defined for this file extension');
}