[various modes[ Replace regexp stream.match with string matches

thiemowmde · web-flow · commit 281f132d501f · 2021-01-15T15:10:13.000+01:00
Warning: This works only when the match() call is a
StringStream.match(), not if it is a native String.match().
Please carefully review this and make sure this doesn't
break anything.
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
@@ -112,7 +112,7 @@ CodeMirror.defineMode("dtd", function(config) {
     indent: function(state, textAfter) {
       var n = state.stack.length;
 
-      if( textAfter.match(/\]\s+|\]/) )n=n-1;
+      if( textAfter.charAt(0) === ']' )n--;
       else if(textAfter.substr(textAfter.length-1, textAfter.length) === ">"){
         if(textAfter.substr(0,1) === "<") {}
         else if( type == "doindent" && textAfter.length > 1 ) {}
diff --git a/mode/ebnf/ebnf.js b/mode/ebnf/ebnf.js
@@ -41,10 +41,10 @@
             state.stringType = stream.peek();
             stream.next(); // Skip quote
             state.stack.unshift(stateType._string);
-          } else if (stream.match(/^\/\*/)) { //comments starting with /*
+          } else if (stream.match('/*')) { //comments starting with /*
             state.stack.unshift(stateType.comment);
             state.commentType = commentType.slash;
-          } else if (stream.match(/^\(\*/)) { //comments starting with (*
+          } else if (stream.match('(*')) { //comments starting with (*
             state.stack.unshift(stateType.comment);
             state.commentType = commentType.parenthesis;
           }
@@ -69,10 +69,10 @@
 
         case stateType.comment:
           while (state.stack[0] === stateType.comment && !stream.eol()) {
-            if (state.commentType === commentType.slash && stream.match(/\*\//)) {
+            if (state.commentType === commentType.slash && stream.match('*/')) {
               state.stack.shift(); // Clear flag
               state.commentType = null;
-            } else if (state.commentType === commentType.parenthesis && stream.match(/\*\)/)) {
+            } else if (state.commentType === commentType.parenthesis && stream.match('*)')) {
               state.stack.shift(); // Clear flag
               state.commentType = null;
             } else {
@@ -83,7 +83,7 @@
 
         case stateType.characterClass:
           while (state.stack[0] === stateType.characterClass && !stream.eol()) {
-            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
+            if (!(stream.match(/^[^\]\\]+/) || stream.match('.'))) {
               state.stack.shift();
             }
           }
@@ -168,10 +168,10 @@
           }
         }
 
-        if (stream.match(/^\/\//)) {
+        if (stream.match('//')) {
           stream.skipToEnd();
           return "comment";
-        } else if (stream.match(/return/)) {
+        } else if (stream.match('return')) {
           return "operator";
         } else if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
           if (stream.match(/(?=[\(.])/)) {
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
@@ -80,7 +80,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   // tokenizers
   function tokenBase(stream, state) {
     // Handle multiline comments
-    if (stream.match(/^#=/, false)) {
+    if (stream.match('#=', false)) {
       state.tokenize = tokenComment;
       return state.tokenize(stream, state);
     }
@@ -141,10 +141,10 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     if (inArray(state)) {
-      if (state.lastToken == "end" && stream.match(/^:/)) {
+      if (state.lastToken == "end" && stream.match(':')) {
         return "operator";
       }
-      if (stream.match(/^end/)) {
+      if (stream.match('end')) {
         return "number";
       }
     }
@@ -201,7 +201,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     // Handle Chars
-    if (stream.match(/^'/)) {
+    if (stream.match('\'')) {
       state.tokenize = tokenChar;
       return state.tokenize(stream, state);
     }
@@ -263,7 +263,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         state.scopes.push('(');
         charsAdvanced += match[1].length;
       }
-      if (currentScope(state) == '(' && stream.match(/^\)/)) {
+      if (currentScope(state) == '(' && stream.match(')')) {
         state.scopes.pop();
         charsAdvanced += 1;
         if (state.scopes.length <= state.firstParenPos) {
@@ -295,10 +295,10 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   }
 
   function tokenAnnotation(stream, state) {
-    stream.match(/.*?(?=,|;|{|}|\(|\)|=|$|\s)/);
-    if (stream.match(/^{/)) {
+    stream.match(/.*?(?=[,;{}()=\s]|$)/);
+    if (stream.match('{')) {
       state.nestedParameters++;
-    } else if (stream.match(/^}/) && state.nestedParameters > 0) {
+    } else if (stream.match('}') && state.nestedParameters > 0) {
       state.nestedParameters--;
     }
     if (state.nestedParameters > 0) {
@@ -310,13 +310,13 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   }
 
   function tokenComment(stream, state) {
-    if (stream.match(/^#=/)) {
+    if (stream.match('#=')) {
       state.nestedComments++;
     }
     if (!stream.match(/.*?(?=(#=|=#))/)) {
       stream.skipToEnd();
     }
-    if (stream.match(/^=#/)) {
+    if (stream.match('=#')) {
       state.nestedComments--;
       if (state.nestedComments == 0)
         state.tokenize = tokenBase;
@@ -347,7 +347,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       return "string";
     }
     if (!stream.match(/^[^']+(?=')/)) { stream.skipToEnd(); }
-    if (stream.match(/^'/)) { state.tokenize = tokenBase; }
+    if (stream.match('\'')) { state.tokenize = tokenBase; }
     return "error";
   }
 
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
@@ -612,7 +612,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
           return getType(state);
         }
       } else if (ch === ' ') {
-        if (stream.match(/^~~/, true)) { // Probably surrounded by space
+        if (stream.match('~~', true)) { // Probably surrounded by space
           if (stream.peek() === ' ') { // Surrounded by spaces, ignore
             return getType(state);
           } else { // Not surrounded by spaces, back up pointer
@@ -711,7 +711,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function footnoteLinkInside(stream, state) {
-    if (stream.match(/^\]:/, true)) {
+    if (stream.match(']:', true)) {
       state.f = state.inline = footnoteUrl;
       if (modeCfg.highlightFormatting) state.formatting = "link";
       var returnType = getType(state);
diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
@@ -153,15 +153,15 @@
         return "variable";
 
       /* attribute lists */
-      if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match(/\[/, true, true)) {
+      if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match('[', true, true)) {
         pConfig.inAttributeList = true;
         return "bracket";
       }
       if (pConfig.inAttributeList) {
         if (pConfig.attributes !== null && pStream.match(wordRegexpBoundary(pConfig.attributes), true, true)) {
           return "attribute";
         }
-        if (pStream.match(/]/, true, true)) {
+        if (pStream.match(']', true, true)) {
           pConfig.inAttributeList = false;
           return "bracket";
         }
diff --git a/mode/oz/oz.js b/mode/oz/oz.js
@@ -45,7 +45,7 @@ CodeMirror.defineMode("oz", function (conf) {
     }
 
     // Special [] keyword
-    if (stream.match(/(\[])/)) {
+    if (stream.match('[]')) {
         return "keyword"
     }
 
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
@@ -39,7 +39,7 @@ CodeMirror.defineMode("pegjs", function (config) {
         stream.next(); // Skip quote
         state.inString = true; // Update state
       }
-      if (!state.inString && !state.inComment && stream.match(/^\/\*/)) {
+      if (!state.inString && !state.inComment && stream.match('/*')) {
         state.inComment = true;
       }
 
@@ -59,7 +59,7 @@ CodeMirror.defineMode("pegjs", function (config) {
         return state.lhs ? "property string" : "string"; // Token style
       } else if (state.inComment) {
         while (state.inComment && !stream.eol()) {
-          if (stream.match(/\*\//)) {
+          if (stream.match('*/')) {
             state.inComment = false; // Clear flag
           } else {
             stream.match(/^.[^\*]*/);
@@ -76,7 +76,7 @@ CodeMirror.defineMode("pegjs", function (config) {
         stream.next();
         state.inCharacterClass = true;
         return 'bracket';
-      } else if (stream.match(/^\/\//)) {
+      } else if (stream.match('//')) {
         stream.skipToEnd();
         return "comment";
       } else if (state.braced || stream.peek() === '{') {
diff --git a/mode/pug/pug.js b/mode/pug/pug.js
@@ -261,7 +261,7 @@ CodeMirror.defineMode("pug", function (config) {
       }
       return 'variable';
     }
-    if (stream.match(/^\+#{/, false)) {
+    if (stream.match('+#{', false)) {
       stream.next();
       state.mixinCallAfter = true;
       return interpolation(stream, state);
diff --git a/mode/rpm/rpm.js b/mode/rpm/rpm.js
@@ -80,12 +80,12 @@ CodeMirror.defineMode("rpm-spec", function() {
 
       // Macros like '%make_install' or '%attr(0775,root,root)'
       if (stream.match(/^%[\w]+/)) {
-        if (stream.match(/^\(/)) { state.macroParameters = true; }
+        if (stream.match('(')) { state.macroParameters = true; }
         return "keyword";
       }
       if (state.macroParameters) {
         if (stream.match(/^\d+/)) { return "number";}
-        if (stream.match(/^\)/)) {
+        if (stream.match(')')) {
           state.macroParameters = false;
           return "keyword";
         }
diff --git a/mode/sass/sass.js b/mode/sass/sass.js
@@ -231,7 +231,7 @@ CodeMirror.defineMode("sass", function(config) {
       }
 
       if(ch === "@"){
-        if(stream.match(/@extend/)){
+        if(stream.match('@extend')){
           if(!stream.match(/\s*[\w]/))
             dedent(state);
         }
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
@@ -411,7 +411,7 @@
             return null;
 
           case "list-literal":
-            if (stream.match(/\]/)) {
+            if (stream.match(']')) {
               state.soyState.pop();
               state.lookupVariables = true;
               popcontext(state);
@@ -517,14 +517,14 @@
             }
             return expression(stream, state);
           case "literal":
-            if (stream.match(/^(?=\{\/literal})/)) {
+            if (stream.match('{/literal}', false)) {
               state.soyState.pop();
               return this.token(stream, state);
             }
             return tokenUntil(stream, state, /\{\/literal}/);
         }
 
-        if (stream.match(/^\{literal}/)) {
+        if (stream.match('{literal}')) {
           state.indent += config.indentUnit;
           state.soyState.push("literal");
           state.context = new Context(state.context, "literal", state.variables);
@@ -581,12 +581,12 @@
           state.soyState.push("import");
           state.indent += 2 * config.indentUnit;
           return "keyword";
-        } else if (match = stream.match(/^<\{/)) {
+        } else if (match = stream.match('<{')) {
           state.soyState.push("template-call-expression");
           state.indent += 2 * config.indentUnit;
           state.soyState.push("tag");
           return "keyword";
-        } else if (match = stream.match(/^<\/>/)) {
+        } else if (match = stream.match('</>')) {
           state.indent -= 1 * config.indentUnit;
           return "keyword";
         }
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
@@ -243,9 +243,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     // varName can be quoted with ` or ' or "
     // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
     if (stream.eat("@")) {
-      stream.match(/^session\./);
-      stream.match(/^local\./);
-      stream.match(/^global\./);
+      stream.match('session.');
+      stream.match('local.');
+      stream.match('global.');
     }
 
     if (stream.eat("'")) {
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
@@ -138,7 +138,7 @@
         // Variable
         if (stream.match(/^(\.|\[)[\w-\'\"\]]+/i, false)) {
           if (!wordIsTag(stream.current())) {
-            stream.match(/\./);
+            stream.match('.');
             return ["variable-2", "variable-name"];
           }
         }
diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
@@ -114,7 +114,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
         return 'header';
     }
 
-    if (ch == '{' && stream.match(/\{\{/))
+    if (ch == '{' && stream.match('{{'))
       return chain(stream, state, twTokenCode);
 
     // rudimentary html:// file:// link matching. TW knows much more ...
diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -36,7 +36,7 @@
       },
       token: function (stream, state) {
         if (state.state == START) {
-          if (stream.match(/---/, false)) {
+          if (stream.match('---', false)) {
             state.state = FRONTMATTER
             return yamlMode.token(stream, state.inner)
           } else {
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
@@ -38,9 +38,9 @@ CodeMirror.defineMode("yaml", function() {
         state.pair = false;
         state.pairStart = false;
         /* document start */
-        if(stream.match(/---/)) { return "def"; }
+        if(stream.match('---')) { return "def"; }
         /* document end */
-        if (stream.match(/\.\.\./)) { return "def"; }
+        if (stream.match('...')) { return "def"; }
         /* array list item */
         if (stream.match(/\s*-\s+/)) { return 'meta'; }
       }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {`
`80`	`80`	`// tokenizers`
`81`	`81`	`function tokenBase(stream, state) {`
`82`	`82`	`// Handle multiline comments`
`83`		`- if (stream.match(/^#=/, false)) {`
	`83`	`+ if (stream.match('#=', false)) {`
`84`	`84`	`state.tokenize = tokenComment;`
`85`	`85`	`return state.tokenize(stream, state);`
`86`	`86`	`}`
`@@ -141,10 +141,10 @@ CodeMirror.defineMode("julia", function(config, parserConf) {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`if (inArray(state)) {`
`144`		`- if (state.lastToken == "end" && stream.match(/^:/)) {`
	`144`	`+ if (state.lastToken == "end" && stream.match(':')) {`
`145`	`145`	`return "operator";`
`146`	`146`	`}`
`147`		`- if (stream.match(/^end/)) {`
	`147`	`+ if (stream.match('end')) {`
`148`	`148`	`return "number";`
`149`	`149`	`}`
`150`	`150`	`}`
`@@ -201,7 +201,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`// Handle Chars`
`204`		`- if (stream.match(/^'/)) {`
	`204`	`+ if (stream.match('\'')) {`
`205`	`205`	`state.tokenize = tokenChar;`
`206`	`206`	`return state.tokenize(stream, state);`
`207`	`207`	`}`
`@@ -263,7 +263,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {`
`263`	`263`	`state.scopes.push('(');`
`264`	`264`	`charsAdvanced += match[1].length;`
`265`	`265`	`}`
`266`		`- if (currentScope(state) == '(' && stream.match(/^\)/)) {`
	`266`	`+ if (currentScope(state) == '(' && stream.match(')')) {`
`267`	`267`	`state.scopes.pop();`
`268`	`268`	`charsAdvanced += 1;`
`269`	`269`	`if (state.scopes.length <= state.firstParenPos) {`
`@@ -295,10 +295,10 @@ CodeMirror.defineMode("julia", function(config, parserConf) {`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`function tokenAnnotation(stream, state) {`
`298`		`- stream.match(/.*?(?=,\|;\|{\|}\|\(\|\)\|=\|$\|\s)/);`
`299`		`- if (stream.match(/^{/)) {`
	`298`	`+ stream.match(/.*?(?=[,;{}()=\s]\|$)/);`
	`299`	`+ if (stream.match('{')) {`
`300`	`300`	`state.nestedParameters++;`
`301`		`- } else if (stream.match(/^}/) && state.nestedParameters > 0) {`
	`301`	`+ } else if (stream.match('}') && state.nestedParameters > 0) {`
`302`	`302`	`state.nestedParameters--;`
`303`	`303`	`}`
`304`	`304`	`if (state.nestedParameters > 0) {`
`@@ -310,13 +310,13 @@ CodeMirror.defineMode("julia", function(config, parserConf) {`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`function tokenComment(stream, state) {`
`313`		`- if (stream.match(/^#=/)) {`
	`313`	`+ if (stream.match('#=')) {`
`314`	`314`	`state.nestedComments++;`
`315`	`315`	`}`
`316`	`316`	`if (!stream.match(/.*?(?=(#=\|=#))/)) {`
`317`	`317`	`stream.skipToEnd();`
`318`	`318`	`}`
`319`		`- if (stream.match(/^=#/)) {`
	`319`	`+ if (stream.match('=#')) {`
`320`	`320`	`state.nestedComments--;`
`321`	`321`	`if (state.nestedComments == 0)`
`322`	`322`	`state.tokenize = tokenBase;`
`@@ -347,7 +347,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {`
`347`	`347`	`return "string";`
`348`	`348`	`}`
`349`	`349`	`if (!stream.match(/^[^']+(?=')/)) { stream.skipToEnd(); }`
`350`		`- if (stream.match(/^'/)) { state.tokenize = tokenBase; }`
	`350`	`+ if (stream.match('\'')) { state.tokenize = tokenBase; }`
`351`	`351`	`return "error";`
`352`	`352`	`}`
`353`	`353`
Original file line number	Diff line number	Diff line change
`@@ -153,15 +153,15 @@`
`153`	`153`	`return "variable";`
`154`	`154`
`155`	`155`	`/* attribute lists */`
`156`		`- if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match(/\[/, true, true)) {`
	`156`	`+ if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match('[', true, true)) {`
`157`	`157`	`pConfig.inAttributeList = true;`
`158`	`158`	`return "bracket";`
`159`	`159`	`}`
`160`	`160`	`if (pConfig.inAttributeList) {`
`161`	`161`	`if (pConfig.attributes !== null && pStream.match(wordRegexpBoundary(pConfig.attributes), true, true)) {`
`162`	`162`	`return "attribute";`
`163`	`163`	`}`
`164`		`- if (pStream.match(/]/, true, true)) {`
	`164`	`+ if (pStream.match(']', true, true)) {`
`165`	`165`	`pConfig.inAttributeList = false;`
`166`	`166`	`return "bracket";`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ CodeMirror.defineMode("oz", function (conf) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// Special [] keyword`
`48`		`- if (stream.match(/(\[])/)) {`
	`48`	`+ if (stream.match('[]')) {`
`49`	`49`	`return "keyword"`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ CodeMirror.defineMode("pug", function (config) {`
`261`	`261`	`}`
`262`	`262`	`return 'variable';`
`263`	`263`	`}`
`264`		`- if (stream.match(/^\+#{/, false)) {`
	`264`	`+ if (stream.match('+#{', false)) {`
`265`	`265`	`stream.next();`
`266`	`266`	`state.mixinCallAfter = true;`
`267`	`267`	`return interpolation(stream, state);`
Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,12 @@ CodeMirror.defineMode("rpm-spec", function() {`
`80`	`80`
`81`	`81`	`// Macros like '%make_install' or '%attr(0775,root,root)'`
`82`	`82`	`if (stream.match(/^%[\w]+/)) {`
`83`		`- if (stream.match(/^\(/)) { state.macroParameters = true; }`
	`83`	`+ if (stream.match('(')) { state.macroParameters = true; }`
`84`	`84`	`return "keyword";`
`85`	`85`	`}`
`86`	`86`	`if (state.macroParameters) {`
`87`	`87`	`if (stream.match(/^\d+/)) { return "number";}`
`88`		`- if (stream.match(/^\)/)) {`
	`88`	`+ if (stream.match(')')) {`
`89`	`89`	`state.macroParameters = false;`
`90`	`90`	`return "keyword";`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ CodeMirror.defineMode("sass", function(config) {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`if(ch === "@"){`
`234`		`- if(stream.match(/@extend/)){`
	`234`	`+ if(stream.match('@extend')){`
`235`	`235`	`if(!stream.match(/\s*[\w]/))`
`236`	`236`	`dedent(state);`
`237`	`237`	`}`