Fix remaining linter issues

spec/atom-environment-spec.js

@@ -95,7 +95,7 @@ describe('AtomEnvironment', () => {
           a + 1 // eslint-disable-line no-undef
         } catch (e) {
           error = e
-          window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
+          window.onerror(e.toString(), 'abc', 2, 3, e)
         }
 
         delete willThrowSpy.mostRecentCall.args[0].preventDefault
@@ -115,7 +115,7 @@ describe('AtomEnvironment', () => {
         try {
           a + 1 // eslint-disable-line no-undef
         } catch (e) {
-          window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
+          window.onerror(e.toString(), 'abc', 2, 3, e)
         }
 
         expect(willThrowSpy).toHaveBeenCalled()
@@ -135,7 +135,7 @@ describe('AtomEnvironment', () => {
           a + 1 // eslint-disable-line no-undef
         } catch (e) {
           error = e
-          window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
+          window.onerror(e.toString(), 'abc', 2, 3, e)
         }
         expect(didThrowSpy).toHaveBeenCalledWith({
           message: error.toString(),
@@ -678,12 +678,12 @@ describe('AtomEnvironment', () => {
     let atomEnvironment, envLoaded, spy
 
     beforeEach(() => {
-      let resolve = null
-      const promise = new Promise(r => {
-        resolve = r
+      let resolvePromise = null
+      const promise = new Promise(resolve => {
+        resolvePromise = resolve
       })
       envLoaded = () => {
-        resolve()
+        resolvePromise()
         return promise
       }
       atomEnvironment = new AtomEnvironment({

spec/atom-paths-spec.js

@@ -22,8 +22,9 @@ describe('AtomPaths', () => {
     describe('when a portable .atom folder exists', () => {
       beforeEach(() => {
         delete process.env.ATOM_HOME
-        if (!fs.existsSync(portableAtomHomePath))
+        if (!fs.existsSync(portableAtomHomePath)) {
           fs.mkdirSync(portableAtomHomePath)
+        }
       })
 
       afterEach(() => {

spec/text-editor-component-spec.js

@@ -173,21 +173,19 @@ describe('TextEditorComponent', () => {
         expect(actualWidth).toBe(expectedWidth + 'px')
       }
 
-      {
-        // Make sure we do not throw an error if a synchronous update is
-        // triggered before measuring the longest line from a
-        // previously-scheduled update.
-        editor.getBuffer().insert(Point(12, Infinity), 'x'.repeat(100))
-        expect(editor.getLongestScreenRow()).toBe(12)
-
-        TextEditorComponent.getScheduler().readDocument(() => {
-          // This will happen before the measurement phase of the update
-          // triggered above.
-          component.pixelPositionForScreenPosition(Point(11, Infinity))
-        })
+      // Make sure we do not throw an error if a synchronous update is
+      // triggered before measuring the longest line from a
+      // previously-scheduled update.
+      editor.getBuffer().insert(Point(12, Infinity), 'x'.repeat(100))
+      expect(editor.getLongestScreenRow()).toBe(12)
 
-        await component.getNextUpdatePromise()
-      }
+      TextEditorComponent.getScheduler().readDocument(() => {
+        // This will happen before the measurement phase of the update
+        // triggered above.
+        component.pixelPositionForScreenPosition(Point(11, Infinity))
+      })
+
+      await component.getNextUpdatePromise()
     })
 
     it('re-renders lines when their height changes', async () => {
@@ -1186,10 +1184,12 @@ describe('TextEditorComponent', () => {
             } else if (k < 95) {
               editor.setSelectedBufferRange(range)
             } else {
-              if (random(2))
+              if (random(2)) {
                 component.setScrollTop(random(component.getScrollHeight()))
-              if (random(2))
+              }
+              if (random(2)) {
                 component.setScrollLeft(random(component.getScrollWidth()))
+              }
             }
 
             component.scheduleUpdate()

spec/text-editor-registry-spec.js

@@ -296,11 +296,13 @@ describe('TextEditorRegistry', function () {
         let disposable = registry.maintainConfig(editor)
         expect(editor.getSoftTabs()).toBe(true)
 
+        /* eslint-disable no-tabs */
         editor.setText(dedent`
           {
           	hello;
           }
         `)
+        /* eslint-enable no-tabs */
         disposable.dispose()
         disposable = registry.maintainConfig(editor)
         expect(editor.getSoftTabs()).toBe(false)
@@ -317,6 +319,7 @@ describe('TextEditorRegistry', function () {
         disposable = registry.maintainConfig(editor)
         expect(editor.getSoftTabs()).toBe(false)
 
+        /* eslint-disable no-tabs */
         editor.setText(dedent`
           /*
            * Comment with a leading space.
@@ -326,6 +329,7 @@ describe('TextEditorRegistry', function () {
           	hello;
           }
         `)
+        /* eslint-enable no-tabs */
         disposable.dispose()
         disposable = registry.maintainConfig(editor)
         expect(editor.getSoftTabs()).toBe(false)

spec/text-editor-spec.js

@@ -4272,7 +4272,7 @@ describe('TextEditor', () => {
           await atom.packages.activatePackage('language-go')
           editor.update({ autoIndent: true })
           atom.grammars.assignLanguageMode(editor, 'source.go')
-          editor.setText('fmt.Printf("some%s",\n	"thing")')
+          editor.setText('fmt.Printf("some%s",\n	"thing")') // eslint-disable-line no-tabs
           editor.setCursorBufferPosition([1, 10])
           editor.insertNewline()
           expect(editor.indentationForBufferRow(1)).toBe(1)

spec/text-mate-language-mode-spec.js

@@ -59,7 +59,6 @@ describe('TextMateLanguageMode', () => {
         languageMode = new TextMateLanguageMode({
           buffer,
           config,
-          config,
           grammar: atom.grammars.grammarForScopeName('source.js')
         })
         languageMode.startTokenizing()

spec/theme-manager-spec.js

@@ -498,9 +498,7 @@ h2 {
         expect(note.getType()).toBe('error')
         expect(note.getMessage()).toContain('Error loading')
         expect(
-          atom.styles.styleElementsBySourcePath[
-            atom.styles.getUserStyleSheetPath()
-          ]
+          atom.styles.styleElementsBySourcePath[atom.styles.getUserStyleSheetPath()]
         ).toBeUndefined()
       })
     })

spec/tree-sitter-language-mode-spec.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-template-curly-in-string */
+
 const { it, beforeEach, afterEach } = require('./async-spec-helpers')
 
 const fs = require('fs')
@@ -830,7 +832,7 @@ describe('TreeSitterLanguageMode', () => {
       buffer.getLanguageMode().syncOperationLimit = 0
 
       const initialSeed = Date.now()
-      for (let i = 0, trial_count = 10; i < trial_count; i++) {
+      for (let i = 0, trialCount = 10; i < trialCount; i++) {
         let seed = initialSeed + i
         // seed = 1541201470759
         const random = Random(seed)
@@ -842,7 +844,7 @@ describe('TreeSitterLanguageMode', () => {
         editor.displayLayer.getScreenLines()
 
         // Make several random edits.
-        for (let j = 0, edit_count = 1 + random(4); j < edit_count; j++) {
+        for (let j = 0, editCount = 1 + random(4); j < editCount; j++) {
           const editRoll = random(10)
           const range = getRandomBufferRange(random, buffer)
 
@@ -894,7 +896,7 @@ describe('TreeSitterLanguageMode', () => {
           if (jasmine.getEnv().currentSpec.results().failedCount > 0) {
             console.log(tokens1)
             console.log(tokens2)
-            debugger
+            debugger // eslint-disable-line no-debugger
             break
           }
         }