Use eslint-disable-next-line instead of eslint-disable-line

`eslint-disable-line` is not recommend by prettier because it puts trailing comments on a new line. Use `eslint-disable-next-line` instead. This is needed ahead of formatting so that eslint passes without code changes right after the formatter is run.
CesiumGS · Apr 16, 2020 · d77b348 · d77b348
1 parent fa10323
commit d77b348
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 32 deletions.
diff --git a/Apps/CesiumViewer/CesiumViewer.js b/Apps/CesiumViewer/CesiumViewer.js
@@ -71,7 +71,8 @@ function main() {
         var message = formatError(exception);
         console.error(message);
         if (!document.querySelector('.cesium-widget-errorPanel')) {
-            window.alert(message); //eslint-disable-line no-alert
+            //eslint-disable-next-line no-alert
+            window.alert(message);
         }
         return;
     }

diff --git a/Documentation/Contributors/CodingGuide/README.md b/Documentation/Contributors/CodingGuide/README.md
@@ -121,10 +121,11 @@ For syntax and style guidelines, we use the ESLint recommended settings (the lis
 - [no-new-require](http://eslint.org/docs/rules/no-new-require)
 
 **[Disabling Rules with Inline Comments](http://eslint.org/docs/user-guide/configuring#disabling-rules-with-inline-comments)**
- * When disabling linting for one line, use `//eslint-disable-line`:
+ * When disabling linting for one line, use `//eslint-disable-next-line`:
 ```js
 function exit(warningMessage) {
-    window.alert('Cannot exit: ' + warningMessage); //eslint-disable-line no-alert
+    //eslint-disable-next-line no-alert
+    window.alert('Cannot exit: ' + warningMessage);
 }
 ```
 

diff --git a/Source/Core/Resource.js b/Source/Core/Resource.js
@@ -1898,9 +1898,12 @@ import TrustedServers from './TrustedServers.js';
 
     function loadWithHttpRequest(url, responseType, method, data, headers, deferred, overrideMimeType) {
         // Note: only the 'json' and 'text' responseTypes transforms the loaded buffer
-        var URL = require('url').parse(url); // eslint-disable-line
-        var http = URL.protocol === 'https:' ? require('https') : require('http'); // eslint-disable-line
-        var zlib = require('zlib'); // eslint-disable-line
+        /* eslint-disable no-undef */
+        var URL = require('url').parse(url);
+        var http = URL.protocol === 'https:' ? require('https') : require('http');
+        var zlib = require('zlib');
+        /* eslint-enable no-undef */
+
         var options = {
             protocol : URL.protocol,
             hostname : URL.hostname,
@@ -1924,7 +1927,8 @@ import TrustedServers from './TrustedServers.js';
                 });
 
                 res.on('end', function() {
-                    var result = Buffer.concat(chunkArray); // eslint-disable-line
+                    // eslint-disable-next-line no-undef
+                    var result = Buffer.concat(chunkArray);
                     if (res.headers['content-encoding'] === 'gzip') {
                         zlib.gunzip(result, function(error, resultUnzipped) {
                             if (error) {

diff --git a/Source/Core/buildModuleUrl.js b/Source/Core/buildModuleUrl.js
@@ -31,7 +31,8 @@ import Resource from './Resource.js';
         a.href = url;
 
         // IE only absolutizes href on get, not set
-        a.href = a.href; // eslint-disable-line no-self-assign
+        // eslint-disable-next-line no-self-assign
+        a.href = a.href;
         return a.href;
     }
 

diff --git a/Source/Core/isCrossOriginUrl.js b/Source/Core/isCrossOriginUrl.js
@@ -22,7 +22,8 @@ import defined from './defined.js';
 
         a.href = url;
         // IE only absolutizes href on get, not set
-        a.href = a.href; // eslint-disable-line no-self-assign
+        // eslint-disable-next-line no-self-assign
+        a.href = a.href;
 
         return protocol !== a.protocol || host !== a.host;
     }

diff --git a/Source/Scene/Cesium3DTileContent.js b/Source/Scene/Cesium3DTileContent.js
@@ -39,7 +39,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         featuresLength : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -59,7 +60,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         pointsLength : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -73,7 +75,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         trianglesLength : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -87,7 +90,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         geometryByteLength : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -101,7 +105,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         texturesByteLength : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -115,7 +120,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         batchTableByteLength : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -132,7 +138,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         innerContents : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -146,7 +153,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         readyPromise : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -160,7 +168,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         tileset : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -174,7 +183,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         tile : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -187,7 +197,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @readonly
          */
         url : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         },
@@ -205,7 +216,8 @@ import DeveloperError from '../Core/DeveloperError.js';
          * @private
          */
         batchTable : {
-            get : function() {  // eslint-disable-line getter-return
+            // eslint-disable-next-line getter-return
+            get : function() {
                 DeveloperError.throwInstantiationError();
             }
         }

diff --git a/Source/Scene/Polyline.js b/Source/Scene/Polyline.js
@@ -73,7 +73,8 @@ import Material from './Material.js';
 
         this._actualLength = undefined;
 
-        this._propertiesChanged = new Uint32Array(NUMBER_OF_PROPERTIES); //eslint-disable-line no-use-before-define
+        // eslint-disable-next-line no-use-before-define
+        this._propertiesChanged = new Uint32Array(NUMBER_OF_PROPERTIES);
         this._polylineCollection = polylineCollection;
         this._dirty = false;
         this._pickId = undefined;

diff --git a/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js b/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js
@@ -34,7 +34,8 @@ import knockout from '../../ThirdParty/knockout.js';
             viewModel._eventHandler.removeInputAction(ScreenSpaceEventType.MOUSE_MOVE);
 
             // Restore hover-over selection to its current value
-            viewModel.picking = viewModel.picking; // eslint-disable-line no-self-assign
+            // eslint-disable-next-line no-self-assign
+            viewModel.picking = viewModel.picking;
         }
     }
 
@@ -321,6 +322,7 @@ import knockout from '../../ThirdParty/knockout.js';
          */
         this.colorBlendMode = Cesium3DTileColorBlendMode.HIGHLIGHT;
 
+        var showOnlyPickedTileDebugLabel = knockout.observable();
         var picking = knockout.observable();
         knockout.defineProperty(this, 'picking', {
             get : function() {
@@ -347,7 +349,7 @@ import knockout from '../../ThirdParty/knockout.js';
                         if (!defined(that._tileset)) {
                             return;
                         }
-                        if (showOnlyPickedTileDebugLabel && defined(picked) && defined(picked.content)) { //eslint-disable-line no-use-before-define
+                        if (showOnlyPickedTileDebugLabel && defined(picked) && defined(picked.content)) {
                             var position;
                             if (scene.pickPositionSupported) {
                                 position = scene.pickPosition(e.endPosition);
@@ -503,7 +505,6 @@ import knockout from '../../ThirdParty/knockout.js';
          */
         this.freezeFrame = false;
 
-        var showOnlyPickedTileDebugLabel = knockout.observable();
         knockout.defineProperty(this, 'showOnlyPickedTileDebugLabel', {
             get : function() {
                 return showOnlyPickedTileDebugLabel();
@@ -1126,7 +1127,8 @@ import knockout from '../../ThirdParty/knockout.js';
                     var length = settings.length;
                     for (var i = 0; i < length; ++i) {
                         var setting = settings[i];
-                        this[setting] = this[setting]; // eslint-disable-line no-self-assign
+                        //eslint-disable-next-line no-self-assign
+                        this[setting] = this[setting];
                     }
 
                     // update view model with existing tileset settings

diff --git a/Source/Workers/transferTypedArrayTest.js b/Source/Workers/transferTypedArrayTest.js
@@ -1,6 +1,7 @@
 // make sure self is defined so that the Dojo build can evaluate this file without crashing.
 if (typeof self === 'undefined') {
-    self = {}; //eslint-disable-line no-implicit-globals, no-global-assign
+    //eslint-disable-next-line no-implicit-globals, no-global-assign
+    self = {};
 }
 
 self.onmessage = function(event) {

diff --git a/Specs/Scene/ModelSpec.js b/Specs/Scene/ModelSpec.js
@@ -2494,7 +2494,8 @@ describe('Scene/Model', function() {
             }
             Matrix4.multiplyByMatrix3(m.modelMatrix, rotate, m.modelMatrix);
 
-            expect(scene).toRenderAndCall(function(rgba) { //eslint-disable-line no-loop-func
+            //eslint-disable-next-line no-loop-func
+            expect(scene).toRenderAndCall(function(rgba) {
                 expect(rgba).not.toEqual([0, 0, 0, 255]);
                 expect(rgba).not.toEqual(oldPixelColor);
                 oldPixelColor = rgba;

diff --git a/Specs/Scene/PointCloud3DTileContentSpec.js b/Specs/Scene/PointCloud3DTileContentSpec.js
@@ -448,7 +448,8 @@ describe('Scene/PointCloud3DTileContent', function() {
                 /* jshint loopfunc: true */
                 while (defined(picked)) {
                     picked.show = false;
-                    expect(scene).toPickAndCall(function(result) { //eslint-disable-line no-loop-func
+                    //eslint-disable-next-line no-loop-func
+                    expect(scene).toPickAndCall(function(result) {
                         picked = result;
                     });
                     ++pickedCountCulling;
@@ -471,7 +472,8 @@ describe('Scene/PointCloud3DTileContent', function() {
                 /* jshint loopfunc: true */
                 while (defined(picked)) {
                     picked.show = false;
-                    expect(scene).toPickAndCall(function(result) { //eslint-disable-line no-loop-func
+                    //eslint-disable-next-line no-loop-func
+                    expect(scene).toPickAndCall(function(result) {
                         picked = result;
                     });
                     ++pickedCount;

diff --git a/Specs/Scene/ShadowMapSpec.js b/Specs/Scene/ShadowMapSpec.js
@@ -735,14 +735,16 @@ describe('Scene/ShadowMap', function() {
             // Render without shadows
             scene.shadowMap.enabled = false;
             var unshadowedColor;
-            renderAndCall(function(rgba) { //eslint-disable-line no-loop-func
+            //eslint-disable-next-line no-loop-func
+            renderAndCall(function(rgba) {
                 unshadowedColor = rgba;
                 expect(rgba).not.toEqual(backgroundColor);
             });
 
             // Render with shadows
             scene.shadowMap.enabled = true;
-            renderAndCall(function(rgba) { //eslint-disable-line no-loop-func
+            //eslint-disable-next-line no-loop-func
+            renderAndCall(function(rgba) {
                 expect(rgba).not.toEqual(backgroundColor);
                 expect(rgba).not.toEqual(unshadowedColor);
             });