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

Commit

Permalink
Merge pull request #6168 from adobe/jasonsanjose/sprint-34-hotfix
Browse files Browse the repository at this point in the history
Sprint 34 Hotfix
  • Loading branch information
RaymondLim committed Dec 3, 2013
2 parents efbd1dc + 5c7ac44 commit b5d7749
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
19 changes: 12 additions & 7 deletions src/extensions/default/JavaScriptCodeHints/ScopeManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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) &&
Expand Down
2 changes: 1 addition & 1 deletion src/thirdparty/CodeMirror2

0 comments on commit b5d7749

Please sign in to comment.