From 8aff0b10c51642800c7e3616e2fe0e86aa4958b0 Mon Sep 17 00:00:00 2001 From: Glenn Ruehle Date: Wed, 20 Nov 2013 15:18:05 -0800 Subject: [PATCH 1/3] Merge pull request #6068 from adobe/dangoor/6067-reading-all-files Filter out dotfiles in code hints --- .../JavaScriptCodeHints/ScopeManager.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js index adb1d3f8b48..7669c917f99 100644 --- a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js +++ b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js @@ -201,12 +201,20 @@ define(function (require, exports, module) { * @return {boolean} true if excluded, false otherwise. */ function isFileExcluded(file) { + if (file.name[0] === ".") { + return true; + } + + var languageID = LanguageManager.getLanguageForPath(file.fullPath).getId(); + if (languageID !== HintUtils.LANGUAGE_ID) { + return true; + } + var excludes = preferences.getExcludedFiles(); - if (!excludes) { return false; } - + return excludes.test(file.name); } @@ -900,11 +908,8 @@ define(function (require, exports, module) { FileSystem.resolve(dir, function (err, directory) { function visitor(entry) { if (entry.isFile) { - if (!isFileExcluded(entry) && entry.name.indexOf(".") !== 0) { // ignore .dotfiles - var languageID = LanguageManager.getLanguageForPath(entry.fullPath).getId(); - if (languageID === HintUtils.LANGUAGE_ID) { - addFilesToTern([entry.fullPath]); - } + if (!isFileExcluded(entry)) { // ignore .dotfiles and non-.js files + addFilesToTern([entry.fullPath]); } } else { return !isDirectoryExcluded(entry.fullPath) && From ed013f689934124c8097fd947eb4503e4893f02b Mon Sep 17 00:00:00 2001 From: Narciso Jaramillo Date: Tue, 19 Nov 2013 17:38:32 -0800 Subject: [PATCH 2/3] Monkeypatch: in CodeMirror, revert less.js to a working version --- src/thirdparty/CodeMirror2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2 index 01e9fbb6496..73b135712a2 160000 --- a/src/thirdparty/CodeMirror2 +++ b/src/thirdparty/CodeMirror2 @@ -1 +1 @@ -Subproject commit 01e9fbb6496cda9e3e8fb3b29b4830770cebe642 +Subproject commit 73b135712a21f9481641547b848100345bc5b7f1 From 5c7ac44ecfdfffd828b575b17e9c058006d0c440 Mon Sep 17 00:00:00 2001 From: Jason San Jose Date: Tue, 3 Dec 2013 11:09:37 -0800 Subject: [PATCH 3/3] update version for sprint 34 hotfix 0.34.1 --- package.json | 2 +- src/config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 379389bfa84..30cf90f86ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Brackets", - "version": "0.34.0-0", + "version": "0.34.1-0", "apiVersion": "0.34.0", "homepage": "http://brackets.io", "issues": { diff --git a/src/config.json b/src/config.json index 974cc8c321a..1ca3ca2a66c 100644 --- a/src/config.json +++ b/src/config.json @@ -18,7 +18,7 @@ "linting.enabled_by_default": true }, "name": "Brackets", - "version": "0.34.0-0", + "version": "0.34.1-0", "apiVersion": "0.34.0", "homepage": "http://brackets.io", "issues": {