Responding to PR feedback

riknoll · riknoll · commit e0aca418bc0a · 2016-07-12T11:13:47.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -987,17 +987,17 @@ namespace ts {
                         // The * and ? wildcards should not match directories or files that start with . if they
                         // appear first in a component. Dotted directories and files can be included explicitly
                         // like so: **/.*/.*
-                        if (component.indexOf("*") === 0) {
+                        if (component.charCodeAt(0) === CharacterCodes.asterisk) {
                             subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";
                             component = component.substr(1);
                         }
-                        else if (component.indexOf("?") === 0) {
+                        else if (component.charCodeAt(0) === CharacterCodes.question) {
                             subpattern += "[^./]";
                             component = component.substr(1);
                         }
                     }
 
-                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+                    subpattern += replaceWildcardCharacters(component, singleAsteriskRegexFragment);
                     hasWrittenComponent = true;
                 }
             }
@@ -1020,6 +1020,10 @@ namespace ts {
         }
 
         return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
+    }
+
+    function replaceWildcardCharacters(component: string, singleAsteriskRegexFragment: string) {
+        return component.replace(reservedCharacterPattern, replaceWildcardCharacter);
 
         function replaceWildcardCharacter(match: string) {
             return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;

Original file line number	Diff line number	Diff line change
`@@ -987,17 +987,17 @@ namespace ts {`
`987`	`987`	`// The * and ? wildcards should not match directories or files that start with . if they`
`988`	`988`	`// appear first in a component. Dotted directories and files can be included explicitly`
`989`	`989`	`// like so: */./.*`
`990`		`- if (component.indexOf("*") === 0) {`
	`990`	`+ if (component.charCodeAt(0) === CharacterCodes.asterisk) {`
`991`	`991`	`subpattern += "([^./]" + singleAsteriskRegexFragment + ")?";`
`992`	`992`	`component = component.substr(1);`
`993`	`993`	`}`
`994`		`- else if (component.indexOf("?") === 0) {`
	`994`	`+ else if (component.charCodeAt(0) === CharacterCodes.question) {`
`995`	`995`	`subpattern += "[^./]";`
`996`	`996`	`component = component.substr(1);`
`997`	`997`	`}`
`998`	`998`	`}`
`999`	`999`
`1000`		`- subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);`
	`1000`	`+ subpattern += replaceWildcardCharacters(component, singleAsteriskRegexFragment);`
`1001`	`1001`	`hasWrittenComponent = true;`
`1002`	`1002`	`}`
`1003`	`1003`	`}`
`@@ -1020,6 +1020,10 @@ namespace ts {`
`1020`	`1020`	`}`
`1021`	`1021`
`1022`	`1022`	`return "^(" + pattern + (usage === "exclude" ? ")($\|/)" : ")$");`
	`1023`	`+ }`
	`1024`	`+`
	`1025`	`+ function replaceWildcardCharacters(component: string, singleAsteriskRegexFragment: string) {`
	`1026`	`+ return component.replace(reservedCharacterPattern, replaceWildcardCharacter);`
`1023`	`1027`
`1024`	`1028`	`function replaceWildcardCharacter(match: string) {`
`1025`	`1029`	`return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;`