Prefer .includes() over .indexOf() (#13945)

sbc100 · web-flow · commit f255b1884ba3 · 2021-04-21T13:27:52.000-07:00
Following on from #13908. See https://caniuse.com/?search=includes
diff --git a/src/cpuprofiler.js b/src/cpuprofiler.js
@@ -351,7 +351,7 @@ var emscriptenCpuProfiler = {
       document.getElementById('trace_limit').onkeydown = function(e) { if (e.which == 13 || e.keycode == 13) emscriptenCpuProfiler.enableTraceWebGL(); else emscriptenCpuProfiler.disableTraceWebGL(); };
       cpuprofiler = document.getElementById('cpuprofiler');
 
-      if (location.search.indexOf('expandhelp') != -1) this.toggleHelpTextVisible();
+      if (location.search.includes('expandhelp')) this.toggleHelpTextVisible();
     }
     
     this.canvas = document.getElementById('cpuprofiler_canvas');
@@ -470,9 +470,9 @@ var emscriptenCpuProfiler = {
 
     // Also poll to autodetect if there is an Emscripten GL canvas available that we could hook into. This is a bit clumsy, but there's no good location to get an event after GL context has been created, so
     // need to resort to polling.
-    if (location.search.indexOf('webglprofiler') != -1 && !this.automaticallyHookedWebGLProfiler) {
+    if (location.search.includes('webglprofiler') && !this.automaticallyHookedWebGLProfiler) {
       this.hookWebGL();
-      if (location.search.indexOf('tracegl') != -1) {
+      if (location.search.includes('tracegl')) {
         var res = location.search.match(/tracegl=(\d+)/);
         var traceGl = res[1];
         document.getElementById('trace_limit').value = traceGl;
@@ -513,18 +513,18 @@ var emscriptenCpuProfiler = {
     var l9 = ['copyTexSubImage3D'];
     var l10 = ['blitFramebuffer', 'texImage3D', 'compressedTexSubImage3D'];
     var l11 = ['texSubImage3D'];
-    if (l0.indexOf(f) != -1) return 0;
-    if (l1.indexOf(f) != -1) return 1;
-    if (l2.indexOf(f) != -1) return 2;
-    if (l3.indexOf(f) != -1) return 3;
-    if (l4.indexOf(f) != -1) return 4;
-    if (l5.indexOf(f) != -1) return 5;
-    if (l6.indexOf(f) != -1) return 6;
-    if (l7.indexOf(f) != -1) return 7;
-    if (l8.indexOf(f) != -1) return 8;
-    if (l9.indexOf(f) != -1) return 9;
-    if (l10.indexOf(f) != -1) return 10;
-    if (l11.indexOf(f) != -1) return 11;
+    if (l0.includes(f)) return 0;
+    if (l1.includes(f)) return 1;
+    if (l2.includes(f)) return 2;
+    if (l3.includes(f)) return 3;
+    if (l4.includes(f)) return 4;
+    if (l5.includes(f)) return 5;
+    if (l6.includes(f)) return 6;
+    if (l7.includes(f)) return 7;
+    if (l8.includes(f)) return 8;
+    if (l9.includes(f)) return 9;
+    if (l10.includes(f)) return 10;
+    if (l11.includes(f)) return 11;
     console.warn('Unexpected WebGL function ' + f);
   },
 
@@ -537,7 +537,7 @@ var emscriptenCpuProfiler = {
 
   toggleHookWebGL: function(glCtx) {
     if (!glCtx) glCtx = this.detectWebGLContext();
-    if (this.hookedWebGLContexts.indexOf(glCtx) != -1) this.unhookWebGL(glCtx);
+    if (this.hookedWebGLContexts.includes(glCtx)) this.unhookWebGL(glCtx);
     else this.hookWebGL(glCtx);
   },
 
@@ -567,7 +567,7 @@ var emscriptenCpuProfiler = {
     document.getElementById("toggle_webgl_profile").style.background = '#E1E1E1';
 
     for (var f in glCtx) {
-      if (typeof glCtx[f] !== 'function' || f.indexOf('real_') == 0) continue;
+      if (typeof glCtx[f] !== 'function' || f.startsWith('real_')) continue;
       var realf = 'real_' + f;
       glCtx[f] = glCtx[realf];
       delete glCtx[realf];
@@ -576,7 +576,7 @@ var emscriptenCpuProfiler = {
 
   hookWebGLFunction: function(f, glCtx) {
     var this_ = this;
-    var section = (this_.hotGLFunctions.indexOf(f) != -1 || f.indexOf('uniform') == 0 || f.indexOf('vertexAttrib') == 0) ? 0 : 1;
+    var section = (this_.hotGLFunctions.incudes(f) || f.startsWith('uniform') || f.startsWith('vertexAttrib')) ? 0 : 1;
     var realf = 'real_' + f;
     glCtx[realf] = glCtx[f];
     var numArgs = this_.webGLFunctionLength(f); // On Firefox & Chrome, could do "glCtx[realf].length", but that doesn't work on Edge, which always reports 0.
@@ -617,7 +617,7 @@ var emscriptenCpuProfiler = {
     this.createSection(0, 'Hot GL', this.colorHotGLFunction, /*traceable=*/true);
     this.createSection(1, 'Cold GL', this.colorColdGLFunction, /*traceable=*/true);
     for (var f in glCtx) {
-      if (typeof glCtx[f] !== 'function' || f.indexOf('real_') == 0) continue;
+      if (typeof glCtx[f] !== 'function' || f.startsWith('real_')) continue;
       this.hookWebGLFunction(f, glCtx);
     }
     var this_ = this;
diff --git a/src/embind/embind.js b/src/embind/embind.js
@@ -562,7 +562,7 @@ var LibraryEmbind = {
         };
     }
 
-    var isUnsignedType = (name.indexOf('unsigned') != -1);
+    var isUnsignedType = (name.includes('unsigned'));
 
     registerType(primitiveType, {
         name: name,
@@ -1075,7 +1075,7 @@ var LibraryEmbind = {
       return getDynCaller(signature, rawFunction);
 #else
 #if !WASM_BIGINT
-      if (signature.indexOf('j') != -1) {
+      if (signature.includes('j')) {
         return getDynCaller(signature, rawFunction);
       }
 #endif
diff --git a/src/jsifier.js b/src/jsifier.js
@@ -35,7 +35,7 @@ function isJsOnlyIdentifier(ident) {
 
 function escapeJSONKey(x) {
   if (/^[\d\w_]+$/.exec(x) || x[0] === '"' || x[0] === "'") return x;
-  assert(x.indexOf("'") < 0, 'cannot have internal single quotes in keys: ' + x);
+  assert(!x.includes("'"), 'cannot have internal single quotes in keys: ' + x);
   return "'" + x + "'";
 }
 
diff --git a/src/library.js b/src/library.js
@@ -1139,7 +1139,7 @@ LibraryManager.library = {
       }
     };
     for (var rule in EXPANSION_RULES_2) {
-      if (pattern.indexOf(rule) >= 0) {
+      if (pattern.includes(rule)) {
         pattern = pattern.replace(new RegExp(rule, 'g'), EXPANSION_RULES_2[rule](date));
       }
     }
@@ -1867,7 +1867,7 @@ LibraryManager.library = {
       return [0, 0, 0, 0, 0, 0, 0, 0];
     }
     // Z placeholder to keep track of zeros when splitting the string on ":"
-    if (str.indexOf("::") === 0) {
+    if (str.startsWith("::")) {
       str = str.replace("::", "Z:"); // leading zeros case
     } else {
       str = str.replace("::", ":Z:");
@@ -2805,7 +2805,7 @@ LibraryManager.library = {
     if (flags & 128 /*EM_LOG_FUNC_PARAMS*/) {
       // To get the actual parameters to the functions, traverse the stack via the unfortunately deprecated 'arguments.callee' method, if it works:
       stack_args = traverseStack(arguments);
-      while (stack_args[1].indexOf('_emscripten_') >= 0)
+      while (stack_args[1].includes('_emscripten_'))
         stack_args = traverseStack(stack_args[0]);
     }
 
@@ -3495,7 +3495,7 @@ LibraryManager.library = {
   $getDynCaller__deps: ['$dynCall'],
   $getDynCaller: function(sig, ptr) {
 #if ASSERTIONS && !DYNCALLS
-    assert(sig.indexOf('j') >= 0, 'getDynCaller should only be called with i64 sigs')
+    assert(sig.includes('j'), 'getDynCaller should only be called with i64 sigs')
 #endif
     var argCache = [];
     return function() {
@@ -3516,7 +3516,7 @@ LibraryManager.library = {
     // Without WASM_BIGINT support we cannot directly call function with i64 as
     // part of thier signature, so we rely the dynCall functions generated by
     // wasm-emscripten-finalize
-    if (sig.indexOf('j') != -1) {
+    if (sig.includes('j')) {
       return dynCallLegacy(sig, ptr, args);
     }
 #endif
@@ -3681,7 +3681,7 @@ LibraryManager.library = {
 
   $asmjsMangle: function(x) {
     var unmangledSymbols = {{{ buildStringArray(WASM_SYSTEM_EXPORTS) }}};
-    return x.indexOf('dynCall_') == 0 || unmangledSymbols.indexOf(x) != -1 ? x : '_' + x;
+    return x.indexOf('dynCall_') == 0 || unmangledSymbols.includes(x) ? x : '_' + x;
   },
 
 #if RELOCATABLE
diff --git a/src/library_c_preprocessor.js b/src/library_c_preprocessor.js
@@ -95,7 +95,7 @@ mergeInto(LibraryManager.library, {
         } else if (kind == 1) {
           // Lookahead for two-character operators.
           var op2 = exprString.substr(i, 2);
-          if (['<=', '>=', '==', '!=', '&&', '||'].indexOf(op2) >= 0) {
+          if (['<=', '>=', '==', '!=', '&&', '||'].includes(op2)) {
             out.push(op2);
             ++i;
           } else {
diff --git a/src/library_dylink.js b/src/library_dylink.js
@@ -32,7 +32,7 @@ var LibraryDylink = {
       sym = Module[asmjsMangle(symName)];
     }
 
-    if (!sym && symName.indexOf('invoke_') == 0) {
+    if (!sym && symName.startsWith('invoke_')) {
       sym = createInvokeFunction(symName.split('_')[1]);
     }
 
@@ -63,7 +63,7 @@ var LibraryDylink = {
       '__wasm_apply_data_relocs',
       '__dso_handle',
       '__set_stack_limits'
-    ].indexOf(symName) != -1
+    ].includes(symName)
 #if SPLIT_MODULE
         // Exports synthesized by wasm-split should be prefixed with '%'
         || symName[0] == '%'
@@ -84,7 +84,7 @@ var LibraryDylink = {
       var replace = false;
       var value = exports[symName];
 #if !WASM_BIGINT
-      if (symName.indexOf('orig$') == 0) {
+      if (symName.startsWith('orig$')) {
         symName = symName.split('$')[1];
         replace = true;
       }
diff --git a/src/library_formatString.js b/src/library_formatString.js
@@ -358,7 +358,7 @@ mergeInto(LibraryManager.library, {
               var parts = argText.split('e');
               if (isGeneral && !flagAlternative) {
                 // Discard trailing zeros and periods.
-                while (parts[0].length > 1 && parts[0].indexOf('.') != -1 &&
+                while (parts[0].length > 1 && parts[0].includes('.') &&
                        (parts[0].slice(-1) == '0' || parts[0].slice(-1) == '.')) {
                   parts[0] = parts[0].slice(0, -1);
                 }
diff --git a/src/library_fs.js b/src/library_fs.js
@@ -326,11 +326,11 @@ FS.staticInit();` +
         return 0;
       }
       // return 0 if any user, group or owner bits are set.
-      if (perms.indexOf('r') !== -1 && !(node.mode & {{{ cDefine('S_IRUGO') }}})) {
+      if (perms.includes('r') && !(node.mode & {{{ cDefine('S_IRUGO') }}})) {
         return {{{ cDefine('EACCES') }}};
-      } else if (perms.indexOf('w') !== -1 && !(node.mode & {{{ cDefine('S_IWUGO') }}})) {
+      } else if (perms.includes('w') && !(node.mode & {{{ cDefine('S_IWUGO') }}})) {
         return {{{ cDefine('EACCES') }}};
-      } else if (perms.indexOf('x') !== -1 && !(node.mode & {{{ cDefine('S_IXUGO') }}})) {
+      } else if (perms.includes('x') && !(node.mode & {{{ cDefine('S_IXUGO') }}})) {
         return {{{ cDefine('EACCES') }}};
       }
       return 0;
@@ -616,7 +616,7 @@ FS.staticInit();` +
         while (current) {
           var next = current.name_next;
 
-          if (mounts.indexOf(current.mount) !== -1) {
+          if (mounts.includes(current.mount)) {
             FS.destroyNode(current);
           }
 
diff --git a/src/library_glemu.js b/src/library_glemu.js
@@ -483,20 +483,20 @@ var LibraryGLEmulation = {
               source = 'uniform mat4 u_textureMatrix' + i + '; \n' + source;
             }
           }
-          if (source.indexOf('gl_FrontColor') >= 0) {
+          if (source.includes('gl_FrontColor')) {
             source = 'varying vec4 v_color; \n' +
                      source.replace(/gl_FrontColor/g, 'v_color');
           }
-          if (source.indexOf('gl_Color') >= 0) {
+          if (source.includes('gl_Color')) {
             source = 'attribute vec4 a_color; \n' +
                      source.replace(/gl_Color/g, 'a_color');
           }
-          if (source.indexOf('gl_Normal') >= 0) {
+          if (source.includes('gl_Normal')) {
             source = 'attribute vec3 a_normal; \n' +
                      source.replace(/gl_Normal/g, 'a_normal');
           }
           // fog
-          if (source.indexOf('gl_FogFragCoord') >= 0) {
+          if (source.includes('gl_FogFragCoord')) {
             source = 'varying float v_fogFragCoord;   \n' +
                      source.replace(/gl_FogFragCoord/g, 'v_fogFragCoord');
           }
@@ -508,26 +508,26 @@ var LibraryGLEmulation = {
               source = 'varying vec4 v_texCoord' + i + ';   \n' + source;
             }
           }
-          if (source.indexOf('gl_Color') >= 0) {
+          if (source.includes('gl_Color')) {
             source = 'varying vec4 v_color; \n' + source.replace(/gl_Color/g, 'v_color');
           }
-          if (source.indexOf('gl_Fog.color') >= 0) {
+          if (source.includes('gl_Fog.color')) {
             source = 'uniform vec4 u_fogColor;   \n' +
                      source.replace(/gl_Fog.color/g, 'u_fogColor');
           }
-          if (source.indexOf('gl_Fog.end') >= 0) {
+          if (source.includes('gl_Fog.end')) {
             source = 'uniform float u_fogEnd;   \n' +
                      source.replace(/gl_Fog.end/g, 'u_fogEnd');
           }
-          if (source.indexOf('gl_Fog.scale') >= 0) {
+          if (source.includes('gl_Fog.scale')) {
             source = 'uniform float u_fogScale;   \n' +
                      source.replace(/gl_Fog.scale/g, 'u_fogScale');
           }
-          if (source.indexOf('gl_Fog.density') >= 0) {
+          if (source.includes('gl_Fog.density')) {
             source = 'uniform float u_fogDensity;   \n' +
                      source.replace(/gl_Fog.density/g, 'u_fogDensity');
           }
-          if (source.indexOf('gl_FogFragCoord') >= 0) {
+          if (source.includes('gl_FogFragCoord')) {
             source = 'varying float v_fogFragCoord;   \n' +
                      source.replace(/gl_FogFragCoord/g, 'v_fogFragCoord');
           }
diff --git a/src/library_glew.js b/src/library_glew.js
@@ -103,12 +103,12 @@ var LibraryGLEW = {
         GLEW.extensions = UTF8ToString(_glGetString(0x1F03)).split(' ');
       }
 
-      if (GLEW.extensions.indexOf(name) != -1)
+      if (GLEW.extensions.includes(name))
         return 1;
 
       // extensions from GLEmulations do not come unprefixed
       // so, try with prefix
-      return (GLEW.extensions.indexOf("GL_" + name) != -1);
+      return (GLEW.extensions.includes("GL_" + name));
     },
   },
 
diff --git a/src/library_glfw.js b/src/library_glfw.js
@@ -1200,11 +1200,11 @@ var LibraryGLFW = {
       GLFW.extensions = UTF8ToString(_glGetString(0x1F03)).split(' ');
     }
 
-    if (GLFW.extensions.indexOf(extension) != -1) return 1;
+    if (GLFW.extensions.includes(extension)) return 1;
 
     // extensions from GLEmulations do not come unprefixed
     // so, try with prefix
-    return (GLFW.extensions.indexOf("GL_" + extension) != -1);
+    return (GLFW.extensions.includes("GL_" + extension));
   },
 
   glfwSwapInterval__deps: ['emscripten_set_main_loop_timing'],
diff --git a/src/library_html5.js b/src/library_html5.js
@@ -131,7 +131,7 @@ var LibraryJSEvents = {
     eventHandlers: [],
 
 #if MIN_IE_VERSION != TARGET_NOT_SUPPORTED
-    isInternetExplorer: function() { return navigator.userAgent.indexOf('MSIE') !== -1 || navigator.appVersion.indexOf('Trident/') > 0; },
+    isInternetExplorer: function() { return navigator.userAgent.includes('MSIE') || navigator.appVersion.indexOf('Trident/') > 0; },
 #endif
 
     // Removes all event handlers on the given DOM element of the given type. Pass in eventTypeString == undefined/null to remove all event handlers regardless of the type.
diff --git a/src/library_html5_webgl.js b/src/library_html5_webgl.js
@@ -339,7 +339,7 @@ var LibraryHtml5WebGL = {
     var context = GL.getContext(contextHandle);
     var extString = UTF8ToString(extension);
 #if GL_EXTENSIONS_IN_PREFIXED_FORMAT
-    if (extString.indexOf('GL_') == 0) extString = extString.substr(3); // Allow enabling extensions both with "GL_" prefix and without.
+    if (extString.startsWith('GL_')) extString = extString.substr(3); // Allow enabling extensions both with "GL_" prefix and without.
 #endif
 
 #if GL_SUPPORT_SIMPLE_ENABLE_EXTENSIONS
@@ -368,7 +368,7 @@ var LibraryHtml5WebGL = {
          'WEBGL_draw_buffers',
          'WEBGL_multi_draw',
          'WEBGL_draw_instanced_base_vertex_base_instance',
-         'WEBGL_multi_draw_instanced_base_vertex_base_instance'].indexOf(extString) >= 0) {
+         'WEBGL_multi_draw_instanced_base_vertex_base_instance'].includes(extString)) {
       console.error('When building with -s GL_SUPPORT_SIMPLE_ENABLE_EXTENSIONS=0, function emscripten_webgl_enable_extension() cannot be used to enable extension '
                     + extString + '! Use one of the functions emscripten_webgl_enable_*() to enable it!');
     }
diff --git a/src/library_syscall.js b/src/library_syscall.js
@@ -1450,15 +1450,15 @@ function wrapSyscallFunction(x, library, isWasi) {
   // If a syscall uses FS, but !SYSCALLS_REQUIRE_FILESYSTEM, then the user
   // has disabled the filesystem or we have proven some other way that this will
   // not be called in practice, and do not need that code.
-  if (!SYSCALLS_REQUIRE_FILESYSTEM && t.indexOf('FS.') >= 0) {
+  if (!SYSCALLS_REQUIRE_FILESYSTEM && t.includes('FS.')) {
     t = modifyFunction(t, function(name, args, body) {
       return 'function ' + name + '(' + args + ') {\n' +
              (ASSERTIONS ? "abort('it should not be possible to operate on streams when !SYSCALLS_REQUIRE_FILESYSTEM');\n" : '') +
              '}';
     });
   }
 
-  var isVariadic = !isWasi && t.indexOf(', varargs') != -1;
+  var isVariadic = !isWasi && t.includes(', varargs');
 #if SYSCALLS_REQUIRE_FILESYSTEM == 0
   var canThrow = false;
 #else
diff --git a/src/library_tty.js b/src/library_tty.js
@@ -116,7 +116,7 @@ mergeInto(LibraryManager.library, {
             } catch(e) {
               // Cross-platform differences: on Windows, reading EOF throws an exception, but on other OSes,
               // reading EOF returns 0. Uniformize behavior by treating the EOF exception to return 0.
-              if (e.toString().indexOf('EOF') != -1) bytesRead = 0;
+              if (e.toString().includes('EOF')) bytesRead = 0;
               else throw e;
             }
 
diff --git a/src/library_webgl.js b/src/library_webgl.js
diff --git a/src/memoryprofiler.js b/src/memoryprofiler.js
diff --git a/src/modules.js b/src/modules.js
diff --git a/src/preamble.js b/src/preamble.js
diff --git a/tools/preprocessor.js b/tools/preprocessor.js

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ function isJsOnlyIdentifier(ident) {`
`35`	`35`
`36`	`36`	`function escapeJSONKey(x) {`
`37`	`37`	`if (/^[\d\w_]+$/.exec(x) \|\| x[0] === '"' \|\| x[0] === "'") return x;`
`38`		`- assert(x.indexOf("'") < 0, 'cannot have internal single quotes in keys: ' + x);`
	`38`	`+ assert(!x.includes("'"), 'cannot have internal single quotes in keys: ' + x);`
`39`	`39`	`return "'" + x + "'";`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ mergeInto(LibraryManager.library, {`
`358`	`358`	`var parts = argText.split('e');`
`359`	`359`	`if (isGeneral && !flagAlternative) {`
`360`	`360`	`// Discard trailing zeros and periods.`
`361`		`- while (parts[0].length > 1 && parts[0].indexOf('.') != -1 &&`
	`361`	`+ while (parts[0].length > 1 && parts[0].includes('.') &&`
`362`	`362`	`(parts[0].slice(-1) == '0' \|\| parts[0].slice(-1) == '.')) {`
`363`	`363`	`parts[0] = parts[0].slice(0, -1);`
`364`	`364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -483,20 +483,20 @@ var LibraryGLEmulation = {`
`483`	`483`	`source = 'uniform mat4 u_textureMatrix' + i + '; \n' + source;`
`484`	`484`	`}`
`485`	`485`	`}`
`486`		`- if (source.indexOf('gl_FrontColor') >= 0) {`
	`486`	`+ if (source.includes('gl_FrontColor')) {`
`487`	`487`	`source = 'varying vec4 v_color; \n' +`
`488`	`488`	`source.replace(/gl_FrontColor/g, 'v_color');`
`489`	`489`	`}`
`490`		`- if (source.indexOf('gl_Color') >= 0) {`
	`490`	`+ if (source.includes('gl_Color')) {`
`491`	`491`	`source = 'attribute vec4 a_color; \n' +`
`492`	`492`	`source.replace(/gl_Color/g, 'a_color');`
`493`	`493`	`}`
`494`		`- if (source.indexOf('gl_Normal') >= 0) {`
	`494`	`+ if (source.includes('gl_Normal')) {`
`495`	`495`	`source = 'attribute vec3 a_normal; \n' +`
`496`	`496`	`source.replace(/gl_Normal/g, 'a_normal');`
`497`	`497`	`}`
`498`	`498`	`// fog`
`499`		`- if (source.indexOf('gl_FogFragCoord') >= 0) {`
	`499`	`+ if (source.includes('gl_FogFragCoord')) {`
`500`	`500`	`source = 'varying float v_fogFragCoord; \n' +`
`501`	`501`	`source.replace(/gl_FogFragCoord/g, 'v_fogFragCoord');`
`502`	`502`	`}`
`@@ -508,26 +508,26 @@ var LibraryGLEmulation = {`
`508`	`508`	`source = 'varying vec4 v_texCoord' + i + '; \n' + source;`
`509`	`509`	`}`
`510`	`510`	`}`
`511`		`- if (source.indexOf('gl_Color') >= 0) {`
	`511`	`+ if (source.includes('gl_Color')) {`
`512`	`512`	`source = 'varying vec4 v_color; \n' + source.replace(/gl_Color/g, 'v_color');`
`513`	`513`	`}`
`514`		`- if (source.indexOf('gl_Fog.color') >= 0) {`
	`514`	`+ if (source.includes('gl_Fog.color')) {`
`515`	`515`	`source = 'uniform vec4 u_fogColor; \n' +`
`516`	`516`	`source.replace(/gl_Fog.color/g, 'u_fogColor');`
`517`	`517`	`}`
`518`		`- if (source.indexOf('gl_Fog.end') >= 0) {`
	`518`	`+ if (source.includes('gl_Fog.end')) {`
`519`	`519`	`source = 'uniform float u_fogEnd; \n' +`
`520`	`520`	`source.replace(/gl_Fog.end/g, 'u_fogEnd');`
`521`	`521`	`}`
`522`		`- if (source.indexOf('gl_Fog.scale') >= 0) {`
	`522`	`+ if (source.includes('gl_Fog.scale')) {`
`523`	`523`	`source = 'uniform float u_fogScale; \n' +`
`524`	`524`	`source.replace(/gl_Fog.scale/g, 'u_fogScale');`
`525`	`525`	`}`
`526`		`- if (source.indexOf('gl_Fog.density') >= 0) {`
	`526`	`+ if (source.includes('gl_Fog.density')) {`
`527`	`527`	`source = 'uniform float u_fogDensity; \n' +`
`528`	`528`	`source.replace(/gl_Fog.density/g, 'u_fogDensity');`
`529`	`529`	`}`
`530`		`- if (source.indexOf('gl_FogFragCoord') >= 0) {`
	`530`	`+ if (source.includes('gl_FogFragCoord')) {`
`531`	`531`	`source = 'varying float v_fogFragCoord; \n' +`
`532`	`532`	`source.replace(/gl_FogFragCoord/g, 'v_fogFragCoord');`
`533`	`533`	`}`