Merge pull request #12990 from CesiumGS/detect-and-remove-unused-eslint-disable-directives

Detect and remove unused eslint disable directives

Author: jjspace

Apps/CesiumViewer/CesiumViewer.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-undef
 window.CESIUM_BASE_URL = window.CESIUM_BASE_URL
   ? window.CESIUM_BASE_URL
   : "../../Build/CesiumUnminified/";

Specs/MetadataTester.js

@@ -401,10 +401,10 @@ function createBuffer(values, componentType) {
       typedArray = new Uint32Array(values);
       break;
     case MetadataComponentType.INT64:
-      typedArray = new BigInt64Array(values); // eslint-disable-line
+      typedArray = new BigInt64Array(values);
       break;
     case MetadataComponentType.UINT64:
-      typedArray = new BigUint64Array(values); // eslint-disable-line
+      typedArray = new BigUint64Array(values);
       break;
     case MetadataComponentType.FLOAT32:
       typedArray = new Float32Array(values);

eslint.config.js

@@ -31,6 +31,9 @@ export default [
   },
   {
     ...configCesium.configs.recommended,
+    linterOptions: {
+      reportUnusedDisableDirectives: "error",
+    },
     languageOptions: {
       sourceType: "module",
     },

packages/engine/Source/Core/FeatureDetection.js

@@ -282,12 +282,10 @@ if (typeof ArrayBuffer !== "undefined") {
   }
 
   if (typeof BigInt64Array !== "undefined") {
-    // eslint-disable-next-line no-undef
     typedArrayTypes.push(BigInt64Array);
   }
 
   if (typeof BigUint64Array !== "undefined") {
-    // eslint-disable-next-line no-undef
     typedArrayTypes.push(BigUint64Array);
   }
 }

packages/engine/Source/Core/HilbertOrder.js

@@ -38,13 +38,11 @@ HilbertOrder.encode2D = function (level, x, y) {
   let rx,
     ry,
     s,
-    // eslint-disable-next-line no-undef
     index = BigInt(0);
 
   for (s = n / 2; s > 0; s /= 2) {
     rx = (p.x & s) > 0 ? 1 : 0;
     ry = (p.y & s) > 0 ? 1 : 0;
-    // eslint-disable-next-line no-undef
     index += BigInt(((3 * rx) ^ ry) * s * s);
     rotate(n, p, rx, ry);
   }
@@ -67,7 +65,6 @@ HilbertOrder.decode2D = function (level, index) {
   if (level < 1) {
     throw new DeveloperError("Hilbert level cannot be less than 1.");
   }
-  // eslint-disable-next-line no-undef
   if (index < BigInt(0) || index >= BigInt(Math.pow(4, level))) {
     throw new DeveloperError(
       "Hilbert index exceeds valid maximum for given level.",
@@ -83,14 +80,11 @@ HilbertOrder.decode2D = function (level, index) {
   let rx, ry, s, t;
 
   for (s = 1, t = index; s < n; s *= 2) {
-    // eslint-disable-next-line no-undef
     rx = 1 & Number(t / BigInt(2));
-    // eslint-disable-next-line no-undef
     ry = 1 & Number(t ^ BigInt(rx));
     rotate(s, p, rx, ry);
     p.x += s * rx;
     p.y += s * ry;
-    // eslint-disable-next-line no-undef
     t /= BigInt(4);
   }
 

packages/engine/Source/Core/S2Cell.js

@@ -1,4 +1,3 @@
-/* eslint-disable new-cap */
 import Cartesian3 from "./Cartesian3.js";
 import Cartographic from "./Cartographic.js";
 import Check from "./Check.js";
@@ -209,15 +208,12 @@ S2Cell.isValidId = function (cellId) {
   }
 
   // Check if face bits indicate a valid value, in range [0-5].
-  // eslint-disable-next-line
   if (cellId >> BigInt(S2_POSITION_BITS) > 5) {
     return false;
   }
 
   // Check trailing 1 bit is in one of the even bit positions allowed for the 30 levels, using a bitmask.
-  // eslint-disable-next-line no-undef
   const lowestSetBit = cellId & (~cellId + BigInt(1));
-  // eslint-disable-next-line
   if (!(lowestSetBit & BigInt("0x1555555555555555"))) {
     return false;
   }
@@ -296,14 +292,12 @@ S2Cell.getLevel = function (cellId) {
   //>>includeEnd('debug');
 
   let lsbPosition = 0;
-  // eslint-disable-next-line
   while (cellId !== BigInt(0)) {
-    // eslint-disable-next-line
     if (cellId & BigInt(1)) {
       break;
     }
     lsbPosition++;
-    cellId = cellId >> BigInt(1); // eslint-disable-line
+    cellId = cellId >> BigInt(1);
   }
 
   // We use (>> 1) because there are 2 bits per level.
@@ -329,10 +323,8 @@ S2Cell.prototype.getChild = function (index) {
   //>>includeEnd('debug');
 
   // Shift sentinel bit 2 positions to the right.
-  // eslint-disable-next-line no-undef
   const newLsb = lsb(this._cellId) >> BigInt(2);
   // Insert child index before the sentinel bit.
-  // eslint-disable-next-line no-undef
   const childCellId = this._cellId + BigInt(2 * index + 1 - 4) * newLsb;
   return new S2Cell(childCellId);
 };
@@ -350,10 +342,8 @@ S2Cell.prototype.getParent = function () {
   }
   //>>includeEnd('debug');
   // Shift the sentinel bit 2 positions to the left.
-  // eslint-disable-next-line no-undef
   const newLsb = lsb(this._cellId) << BigInt(2);
   // Erase the left over bits to the right of the sentinel bit.
-  // eslint-disable-next-line no-undef
   return new S2Cell((this._cellId & (~newLsb + BigInt(1))) | newLsb);
 };
 
@@ -455,7 +445,6 @@ S2Cell.fromFacePositionLevel = function (face, position, level) {
   ).join("0");
   const positionSuffixPadding = Array(S2_POSITION_BITS - 2 * level).join("0");
 
-  // eslint-disable-next-line no-undef
   const cellId = BigInt(
     `0b${faceBitString}${positionPrefixPadding}${positionBitString}1${
       // Adding the sentinel bit that always follows the position bits.
@@ -500,7 +489,7 @@ function convertCellIdToFaceSiTi(cellId, level) {
   // that represent the parent cell center.
   const isLeaf = level === 30;
   const shouldCorrect =
-    !isLeaf && (BigInt(i) ^ (cellId >> BigInt(2))) & BigInt(1); // eslint-disable-line
+    !isLeaf && (BigInt(i) ^ (cellId >> BigInt(2))) & BigInt(1);
   const correction = isLeaf ? 1 : shouldCorrect ? 2 : 0;
   const si = (i << 1) + correction;
   const ti = (j << 1) + correction;
@@ -515,7 +504,6 @@ function convertCellIdToFaceIJ(cellId) {
     generateLookupTable();
   }
 
-  // eslint-disable-next-line no-undef
   const face = Number(cellId >> BigInt(S2_POSITION_BITS));
   let bits = face & S2_SWAP_MASK;
   const lookupMask = (1 << S2_LOOKUP_BITS) - 1;
@@ -529,7 +517,7 @@ function convertCellIdToFaceIJ(cellId) {
     const extractMask = (1 << (2 * numberOfBits)) - 1;
     bits +=
       Number(
-        (cellId >> BigInt(k * 2 * S2_LOOKUP_BITS + 1)) & BigInt(extractMask), // eslint-disable-line
+        (cellId >> BigInt(k * 2 * S2_LOOKUP_BITS + 1)) & BigInt(extractMask),
       ) << 2;
 
     bits = S2_LOOKUP_IJ[bits];
@@ -715,15 +703,15 @@ function generateLookupTable() {
  * @private
  */
 function lsb(cellId) {
-  return cellId & (~cellId + BigInt(1)); // eslint-disable-line
+  return cellId & (~cellId + BigInt(1));
 }
 
 /**
  * Return the lowest-numbered bit that is on for cells at the given level.
  * @private
  */
 function lsbForLevel(level) {
-  return BigInt(1) << BigInt(2 * (S2_MAX_LEVEL - level)); // eslint-disable-line
+  return BigInt(1) << BigInt(2 * (S2_MAX_LEVEL - level));
 }
 
 // Lookup table for getting trailing zero bits.
@@ -740,7 +728,7 @@ const Mod67BitPosition = [
  * @private
  */
 function countTrailingZeroBits(x) {
-  return Mod67BitPosition[(-x & x) % BigInt(67)]; // eslint-disable-line
+  return Mod67BitPosition[(-x & x) % BigInt(67)];
 }
 
 export default S2Cell;

packages/engine/Source/Scene/GaussianSplat3DTileContent.js

@@ -236,7 +236,6 @@ Object.defineProperties(GaussianSplat3DTileContent.prototype, {
    * @readonly
    */
   batchTableByteLength: {
-    // eslint-disable-next-line getter-return
     get: function () {
       return 0;
     },

packages/engine/Source/Scene/Implicit3DTileContent.js

@@ -905,15 +905,13 @@ function deriveBoundingVolumeS2(
   }
 
   // Extract the first 3 face bits from the 64-bit S2 cell ID.
-  // eslint-disable-next-line no-undef
   const face = Number(parentTile._boundingVolume.s2Cell._cellId >> BigInt(61));
   // The Hilbert curve is rotated for the "odd" faces on the S2 Earthcube.
   // See http://s2geometry.io/devguide/img/s2cell_global.jpg
   const position =
     face % 2 === 0
       ? HilbertOrder.encode2D(level, x, y)
       : HilbertOrder.encode2D(level, y, x);
-  // eslint-disable-next-line no-undef
   const cell = S2Cell.fromFacePositionLevel(face, BigInt(position), level);
 
   let minHeight, maxHeight;

packages/engine/Source/Scene/MetadataComponentType.js

@@ -119,12 +119,12 @@ MetadataComponentType.getMinimum = function (type) {
       return 0;
     case MetadataComponentType.INT64:
       if (FeatureDetection.supportsBigInt()) {
-        return BigInt("-9223372036854775808"); // eslint-disable-line
+        return BigInt("-9223372036854775808");
       }
       return -Math.pow(2, 63);
     case MetadataComponentType.UINT64:
       if (FeatureDetection.supportsBigInt()) {
-        return BigInt(0); // eslint-disable-line
+        return BigInt(0);
       }
       return 0;
     case MetadataComponentType.FLOAT32:
@@ -168,13 +168,13 @@ MetadataComponentType.getMaximum = function (type) {
     case MetadataComponentType.INT64:
       if (FeatureDetection.supportsBigInt()) {
         // Need to initialize with a string otherwise the value will be 9223372036854775808
-        return BigInt("9223372036854775807"); // eslint-disable-line
+        return BigInt("9223372036854775807");
       }
       return Math.pow(2, 63) - 1;
     case MetadataComponentType.UINT64:
       if (FeatureDetection.supportsBigInt()) {
         // Need to initialize with a string otherwise the value will be 18446744073709551616
-        return BigInt("18446744073709551615"); // eslint-disable-line
+        return BigInt("18446744073709551615");
       }
       return Math.pow(2, 64) - 1;
     case MetadataComponentType.FLOAT32:
@@ -333,7 +333,7 @@ MetadataComponentType.unnormalize = function (value, type) {
       type === MetadataComponentType.UINT64) &&
     FeatureDetection.supportsBigInt()
   ) {
-    value = BigInt(value); // eslint-disable-line
+    value = BigInt(value);
   }
 
   if (value > max) {

packages/engine/Source/Scene/MetadataTableProperty.js

@@ -549,7 +549,6 @@ function getInt64NumberFallback(index, values) {
 function getInt64BigIntFallback(index, values) {
   const dataView = values.dataView;
   const byteOffset = index * 8;
-  // eslint-disable-next-line no-undef
   let value = BigInt(0);
   const isNegative = (dataView.getUint8(byteOffset + 7) & 0x80) > 0;
   let carrying = true;
@@ -565,7 +564,7 @@ function getInt64BigIntFallback(index, values) {
         byte = ~byte & 0xff;
       }
     }
-    value += BigInt(byte) * (BigInt(1) << BigInt(i * 8)); // eslint-disable-line
+    value += BigInt(byte) * (BigInt(1) << BigInt(i * 8));
   }
   if (isNegative) {
     value = -value;
@@ -592,14 +591,11 @@ function getUint64BigIntFallback(index, values) {
   const byteOffset = index * 8;
 
   // Split 64-bit number into two 32-bit (4-byte) parts
-  // eslint-disable-next-line no-undef
   const left = BigInt(dataView.getUint32(byteOffset, true));
 
-  // eslint-disable-next-line no-undef
   const right = BigInt(dataView.getUint32(byteOffset + 4, true));
 
   // Combine the two 32-bit values
-  // eslint-disable-next-line no-undef
   const value = left + BigInt(4294967296) * right;
 
   return value;
@@ -770,15 +766,14 @@ function BufferView(bufferView, componentType, length) {
         return getInt64BigIntFallback(index, that);
       };
     } else {
-      // eslint-disable-next-line
       typedArray = new BigInt64Array(
         bufferView.buffer,
         bufferView.byteOffset,
         length,
       );
       setFunction = function (index, value) {
         // Convert the number to a BigInt before setting the value in the typed array
-        that.typedArray[index] = BigInt(value); // eslint-disable-line
+        that.typedArray[index] = BigInt(value);
       };
     }
   } else if (componentType === MetadataComponentType.UINT64) {
@@ -804,15 +799,14 @@ function BufferView(bufferView, componentType, length) {
         return getUint64BigIntFallback(index, that);
       };
     } else {
-      // eslint-disable-next-line
       typedArray = new BigUint64Array(
         bufferView.buffer,
         bufferView.byteOffset,
         length,
       );
       setFunction = function (index, value) {
         // Convert the number to a BigInt before setting the value in the typed array
-        that.typedArray[index] = BigInt(value); // eslint-disable-line
+        that.typedArray[index] = BigInt(value);
       };
     }
   } else {