Index: Source/devtools/front_end/FileSystemMapping.js |
diff --git a/Source/devtools/front_end/FileSystemMapping.js b/Source/devtools/front_end/FileSystemMapping.js |
index 6ef139ed0b167cc1d25464cd18073feb724292a7..93743d77ca18383a75bdf6831d67634b9736f924 100644 |
--- a/Source/devtools/front_end/FileSystemMapping.js |
+++ b/Source/devtools/front_end/FileSystemMapping.js |
@@ -72,7 +72,7 @@ WebInspector.FileSystemMapping = function() |
else |
defaultExcludedFolders = defaultExcludedFolders.concat(defaultLinuxExcludedFolders); |
var defaultExcludedFoldersPattern = defaultExcludedFolders.join("|"); |
- WebInspector.settings.workspaceFolderExcludePattern = WebInspector.settings.createSetting("workspaceFolderExcludePattern", defaultExcludedFoldersPattern); |
+ WebInspector.settings.workspaceFolderExcludePattern = WebInspector.settings.createRegExpSetting("workspaceFolderExcludePattern", defaultExcludedFoldersPattern, WebInspector.isWin() ? "i" : ""); |
/** @type {!Object.<string, !Array.<!WebInspector.FileSystemMapping.Entry>>} */ |
this._fileSystemMappings = {}; |
/** @type {!Object.<string, !Array.<!WebInspector.FileSystemMapping.ExcludedFolderEntry>>} */ |
@@ -121,13 +121,6 @@ WebInspector.FileSystemMapping.prototype = { |
} |
} |
- var workspaceFolderExcludePattern = WebInspector.settings.workspaceFolderExcludePattern.get() |
- try { |
- var flags = WebInspector.isWin() ? "i" : ""; |
- this._workspaceFolderExcludeRegex = workspaceFolderExcludePattern ? new RegExp(workspaceFolderExcludePattern, flags) : null; |
- } catch (e) { |
- } |
- |
this._rebuildIndexes(); |
}, |
@@ -329,7 +322,8 @@ WebInspector.FileSystemMapping.prototype = { |
if (entry.path === folderPath) |
return true; |
} |
- return this._workspaceFolderExcludeRegex && this._workspaceFolderExcludeRegex.test(folderPath); |
+ var regex = WebInspector.settings.workspaceFolderExcludePattern.asRegExp(); |
+ return regex && regex.test(folderPath); |
}, |
/** |