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

Fix crawlComplete exception when running tests #12659

Merged
merged 1 commit into from
Aug 14, 2016
Merged

Fix crawlComplete exception when running tests #12659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/search/FindInFiles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,19 @@ define(function (require, exports, module) {
}

function nodeFileCacheComplete(event, numFiles, cacheSize) {
var projectName = ProjectManager.getProjectRoot().name || "noName00";
if (/\/test\/SpecRunner\.html$/.test(window.location.pathname)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to check for the /brackets/i regex too. But I don't know the location on the other OS.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot be certain what the git clone is named on the system. Also, it's very likely that a Brackets Shell window that has a SpecRunner.html loaded, which in turn loaded the rest of Brackets, actually belongs to Brackets ;)

// Ignore the event in the SpecRunner window
return;
}

var projectRoot = ProjectManager.getProjectRoot(),
projectName = projectRoot ? projectRoot.name : null;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a console.error if we don't have the projectRoot?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we don't have the project root, projectName is null and thus we get the error message below.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I should not review code when I'm tired...


if (!projectName) {
console.error("'File cache complete' event received, but no project root found");
projectName = "noName00";
}

FindUtils.setInstantSearchDisabled(false);
// Node search could be disabled if some error has happened in node. But upon
// project change, if we get this message, then it means that node search is working,
Expand Down