Merge pull request #261 from robertohuertasm/patch-insiders

Patch insiders
vscode-icons · Sep 2, 2016 · 8cafdea · 8cafdea
2 parents b461a47 + fb2af93
commit 8cafdea
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## 1.8.9 (September 03, 2016)
+  - Patch: support for dotted extensions in CheckAssociations method. ([@robertohuertasm](https://github.com/robertohuertasm) in [#262](https://github.com/robertohuertasm/vscode-icons/pull/262))
+
+## 1.8.8 (September 02, 2016)
+  - Patch: support for VSCode Insiders 1.5.0 5fb513. ([@robertohuertasm](https://github.com/robertohuertasm) in [#261](https://github.com/robertohuertasm/vscode-icons/pull/261))
+  - Enhancement: Ansible & Terraform support. ([@jens1o](https://github.com/jens1o) in [#260](https://github.com/robertohuertasm/vscode-icons/pull/260))
+  - Script[s] folder icons. ([@claudiospizzi](https://github.com/claudiospizzi) in [#257](https://github.com/robertohuertasm/vscode-icons/pull/257))
+  - Enhancement: 'sources' linked to src folder icon. ([@claudiospizzi](https://github.com/claudiospizzi) in [#256](https://github.com/robertohuertasm/vscode-icons/pull/256))
+  - Enhancement: task.json linked to vscode icon. ([@Gama11](https://github.com/Gama11) in [#255](https://github.com/robertohuertasm/vscode-icons/pull/255))
+  - Enhancement: license.md support. ([@Gama11](https://github.com/Gama11) in [#254](https://github.com/robertohuertasm/vscode-icons/pull/254))
+  - Enhancement: CodeClimate icon with margins. ([@Gama11](https://github.com/Gama11) in [#253](https://github.com/robertohuertasm/vscode-icons/pull/253))
+
 ## 1.8.7 (September 01, 2016)
   - Enhancement: .pex as an xml extension. ([@Gama11](https://github.com/Gama11) in [#252](https://github.com/robertohuertasm/vscode-icons/pull/252))
   - Patch: support for VSCode insiders 1.5.0 d2c04e37. ([@robertohuertasm](https://github.com/robertohuertasm) in [#251](https://github.com/robertohuertasm/vscode-icons/pull/251))

diff --git a/icons.zip b/icons.zip
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "vscode-icons",
     "displayName": "vscode-icons",
     "description": "Icons for Visual Studio Code",
-    "version": "1.8.7",
+    "version": "1.8.8",
     "publisher": "robertohuertasm",
     "license": "MIT",
     "author": {

diff --git a/src/build/supportedExtensions.js b/src/build/supportedExtensions.js
@@ -7,7 +7,7 @@ exports.extensions = {
     { icon: 'apib', extensions: ['apib'] },
     { icon: 'applescript', extensions: ['app'] },
     { icon: 'appveyor', extensions: ['appveyor.yml'], special: 'yml' },
-    { icon: 'ansible', extensions: ['.ansible'] },
+    { icon: 'ansible', extensions: ['ansible'] },
     { icon: 'asp', extensions: ['asp'] },
     { icon: 'aspx', extensions: ['aspx'] },
     { icon: 'assembly', extensions: ['s', 'asm'] },

diff --git a/src/build/templates/checkAssociations.js b/src/build/templates/checkAssociations.js
@@ -15,7 +15,9 @@ var checkAssociations = function checkAssociations(config, filename, additionalC
     asc = ascs[i];
     rx = new RegExp(asc[0], 'gi');
     if (rx.test(filename)) {
-      return asc[1] + (additionalClass || '');
+      var s = asc[1].replace(/\./g, '_');
+      if ((/^\d/).test(s)) s = 'n' + s;
+      return s + (additionalClass || '');
     }
   }
   return null;

diff --git a/src/build/templates/final.js b/src/build/templates/final.js
@@ -2,12 +2,12 @@ module.exports =
 '/* eslint-disable */\n module.exports = { ' +
 'iconClassReplace: \'t.prototype.iconClass = ' +
   'function(s) { return vsicons.iconClass(this, s); }\', ' +
-'iconClassInsidersReplace: \'this.fileIconClasses(n.resource.fsPath).' +
-  'concat(vsicons.iconClass(this, n, true))\', ' +
+'iconClassInsidersReplace: \'this.fileIconClasses((n||i).resource.fsPath).' +
+  'concat(vsicons.iconClass(this, n||i, true))\', ' +
 'iconClassInsiders2Replace: \'e.fileIconClasses(r).' +
   'concat(vsicons.iconClass(e, r, true, true))\', ' +
-'iconClassInsiders3Replace: \'this.folderIconClasses(n.resource.fsPath).' +
-  'concat(vsicons.iconClass(this, n, true))\', ' +
+'iconClassInsiders3Replace: \'this.folderIconClasses((n||i).resource.fsPath).' +
+  'concat(vsicons.iconClass(this, n||i, true))\', ' +
 'tabLabelReplace: \'vsicons.tabLabel(r)\', ' +
 'editorsReplace: \'vsicons.editors(this)\', ' +
 'vsicons: \'vsicons = {' +

diff --git a/src/dev/extVersion.js b/src/dev/extVersion.js
@@ -1 +1 @@
-module.exports = '1.8.7';
+module.exports = '1.8.9';
diff --git a/src/dev/replacements.js b/src/dev/replacements.js
diff --git a/src/dev/settings.js b/src/dev/settings.js
@@ -32,9 +32,9 @@ function getSettings() {
   var cssreplace = '/*! *****************************************************************************'; // eslint-disable-line
   var jsiconsreplace = isInsiders ?
   [
-    'this.fileIconClasses(n.resource.fsPath)',
+    /this\.fileIconClasses\((i|n)\.resource\.fsPath\)/,
     'e.fileIconClasses(r)',
-    'this.folderIconClasses(n.resource.fsPath)'
+    /this\.folderIconClasses\((i|n)\.resource\.fsPath\)/
   ] :
   't.prototype.iconClass=function(e){return e.isDirectory?"folder-icon":"text-file-icon"}';
   var jsfile = base + (isWin ? '\\workbench.main.js' : '/workbench.main.js');
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = '1.8.7';
		module.exports = '1.8.9';