Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit b5d7749

Browse files
committed
Merge pull request #6168 from adobe/jasonsanjose/sprint-34-hotfix
Sprint 34 Hotfix
2 parents efbd1dc + 5c7ac44 commit b5d7749

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Brackets",
3-
"version": "0.34.0-0",
3+
"version": "0.34.1-0",
44
"apiVersion": "0.34.0",
55
"homepage": "http://brackets.io",
66
"issues": {

src/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"linting.enabled_by_default": true
1919
},
2020
"name": "Brackets",
21-
"version": "0.34.0-0",
21+
"version": "0.34.1-0",
2222
"apiVersion": "0.34.0",
2323
"homepage": "http://brackets.io",
2424
"issues": {

src/extensions/default/JavaScriptCodeHints/ScopeManager.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,20 @@ define(function (require, exports, module) {
201201
* @return {boolean} true if excluded, false otherwise.
202202
*/
203203
function isFileExcluded(file) {
204+
if (file.name[0] === ".") {
205+
return true;
206+
}
207+
208+
var languageID = LanguageManager.getLanguageForPath(file.fullPath).getId();
209+
if (languageID !== HintUtils.LANGUAGE_ID) {
210+
return true;
211+
}
212+
204213
var excludes = preferences.getExcludedFiles();
205-
206214
if (!excludes) {
207215
return false;
208216
}
209-
217+
210218
return excludes.test(file.name);
211219
}
212220

@@ -900,11 +908,8 @@ define(function (require, exports, module) {
900908
FileSystem.resolve(dir, function (err, directory) {
901909
function visitor(entry) {
902910
if (entry.isFile) {
903-
if (!isFileExcluded(entry) && entry.name.indexOf(".") !== 0) { // ignore .dotfiles
904-
var languageID = LanguageManager.getLanguageForPath(entry.fullPath).getId();
905-
if (languageID === HintUtils.LANGUAGE_ID) {
906-
addFilesToTern([entry.fullPath]);
907-
}
911+
if (!isFileExcluded(entry)) { // ignore .dotfiles and non-.js files
912+
addFilesToTern([entry.fullPath]);
908913
}
909914
} else {
910915
return !isDirectoryExcluded(entry.fullPath) &&

src/thirdparty/CodeMirror2

0 commit comments

Comments
 (0)