Remove eslint comments unnecessary after 40f73fd

IvanGoncharov · IvanGoncharov · commit 8d1ae25de444 · 2017-12-15T01:02:39.000+02:00
diff --git a/src/__tests__/starWarsIntrospection-test.js b/src/__tests__/starWarsIntrospection-test.js
@@ -12,9 +12,6 @@ import { describe, it } from 'mocha';
 import { StarWarsSchema } from './starWarsSchema.js';
 import { graphql } from '../graphql';
 
-// 80+ char lines are useful in describe/it, so ignore in this file.
-/* eslint-disable max-len */
-
 describe('Star Wars Introspection Tests', () => {
   describe('Basic Introspection', () => {
     it('Allows querying the schema for types', async () => {
diff --git a/src/__tests__/starWarsQuery-test.js b/src/__tests__/starWarsQuery-test.js
@@ -12,9 +12,6 @@ import { describe, it } from 'mocha';
 import { StarWarsSchema } from './starWarsSchema.js';
 import { graphql } from '../graphql';
 
-// 80+ char lines are useful in describe/it, so ignore in this file.
-/* eslint-disable max-len */
-
 describe('Star Wars Query Tests', () => {
   describe('Basic Queries', () => {
     it('Correctly identifies R2-D2 as the hero of the Star Wars Saga', async () => {
diff --git a/src/execution/__tests__/executor-test.js b/src/execution/__tests__/executor-test.js
@@ -393,9 +393,8 @@ describe('Execute: Handles basic execution tasks', () => {
         throw new Error('Error getting syncError');
       },
       syncRawError() {
-        /* eslint-disable */
+        // eslint-disable-next-line no-throw-literal
         throw 'Error getting syncRawError';
-        /* eslint-enable */
       },
       syncReturnError() {
         return new Error('Error getting syncReturnError');
diff --git a/src/execution/__tests__/lists-test.js b/src/execution/__tests__/lists-test.js
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// 80+ char lines are useful in describe/it, so ignore in this file.
-/* eslint-disable max-len */
-
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { formatError } from '../../error';
diff --git a/src/execution/__tests__/mutations-test.js b/src/execution/__tests__/mutations-test.js
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// 80+ char lines are useful in describe/it, so ignore in this file.
-/* eslint-disable max-len */
-
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { execute } from '../execute';
diff --git a/src/execution/__tests__/nonnull-test.js b/src/execution/__tests__/nonnull-test.js
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// 80+ char lines are useful in describe/it, so ignore in this file.
-/* eslint-disable max-len */
-
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { execute } from '../execute';
diff --git a/src/execution/__tests__/variables-test.js b/src/execution/__tests__/variables-test.js
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// 80+ char lines are useful in describe/it, so ignore in this file.
-/* eslint-disable max-len */
-
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { execute } from '../execute';
diff --git a/src/language/__tests__/lexer-test.js b/src/language/__tests__/lexer-test.js
@@ -25,8 +25,6 @@ function expectSyntaxError(text, message, location) {
   }
 }
 
-/* eslint-disable max-len */
-
 describe('Lexer', () => {
   it('disallows uncommon control characters', () => {
     expectSyntaxError(
diff --git a/src/language/__tests__/schema-printer-test.js b/src/language/__tests__/schema-printer-test.js
@@ -11,6 +11,7 @@ import { readFileSync } from 'fs';
 import { join } from 'path';
 import { parse } from '../parser';
 import { print } from '../printer';
+import dedent from '../../jsutils/dedent';
 
 describe('Printer', () => {
   it('prints minimal ast', () => {
@@ -45,115 +46,113 @@ describe('Printer', () => {
 
     const printed = print(ast);
 
-    /* eslint-disable max-len */
-    expect(printed).to.equal(
-      `schema {
-  query: QueryType
-  mutation: MutationType
-}
+    expect(printed).to.equal(dedent`
+      schema {
+        query: QueryType
+        mutation: MutationType
+      }
 
-"""
-This is a description
-of the \`Foo\` type.
-"""
-type Foo implements Bar {
-  one: Type
-  two(argument: InputType!): Type
-  three(argument: InputType, other: String): Int
-  four(argument: String = "string"): String
-  five(argument: [String] = ["string", "string"]): String
-  six(argument: InputType = {key: "value"}): Type
-  seven(argument: Int = null): Type
-}
+      """
+      This is a description
+      of the \`Foo\` type.
+      """
+      type Foo implements Bar {
+        one: Type
+        two(argument: InputType!): Type
+        three(argument: InputType, other: String): Int
+        four(argument: String = "string"): String
+        five(argument: [String] = ["string", "string"]): String
+        six(argument: InputType = {key: "value"}): Type
+        seven(argument: Int = null): Type
+      }
 
-type AnnotatedObject @onObject(arg: "value") {
-  annotatedField(arg: Type = "default" @onArg): Type @onField
-}
+      type AnnotatedObject @onObject(arg: "value") {
+        annotatedField(arg: Type = "default" @onArg): Type @onField
+      }
 
-type UndefinedType
+      type UndefinedType
 
-extend type Foo {
-  seven(argument: [String]): Type
-}
+      extend type Foo {
+        seven(argument: [String]): Type
+      }
 
-extend type Foo @onType
+      extend type Foo @onType
 
-interface Bar {
-  one: Type
-  four(argument: String = "string"): String
-}
+      interface Bar {
+        one: Type
+        four(argument: String = "string"): String
+      }
 
-interface AnnotatedInterface @onInterface {
-  annotatedField(arg: Type @onArg): Type @onField
-}
+      interface AnnotatedInterface @onInterface {
+        annotatedField(arg: Type @onArg): Type @onField
+      }
 
-interface UndefinedInterface
+      interface UndefinedInterface
 
-extend interface Bar {
-  two(argument: InputType!): Type
-}
+      extend interface Bar {
+        two(argument: InputType!): Type
+      }
 
-extend interface Bar @onInterface
+      extend interface Bar @onInterface
 
-union Feed = Story | Article | Advert
+      union Feed = Story | Article | Advert
 
-union AnnotatedUnion @onUnion = A | B
+      union AnnotatedUnion @onUnion = A | B
 
-union AnnotatedUnionTwo @onUnion = A | B
+      union AnnotatedUnionTwo @onUnion = A | B
 
-union UndefinedUnion
+      union UndefinedUnion
 
-extend union Feed = Photo | Video
+      extend union Feed = Photo | Video
 
-extend union Feed @onUnion
+      extend union Feed @onUnion
 
-scalar CustomScalar
+      scalar CustomScalar
 
-scalar AnnotatedScalar @onScalar
+      scalar AnnotatedScalar @onScalar
 
-extend scalar CustomScalar @onScalar
+      extend scalar CustomScalar @onScalar
 
-enum Site {
-  DESKTOP
-  MOBILE
-}
+      enum Site {
+        DESKTOP
+        MOBILE
+      }
 
-enum AnnotatedEnum @onEnum {
-  ANNOTATED_VALUE @onEnumValue
-  OTHER_VALUE
-}
+      enum AnnotatedEnum @onEnum {
+        ANNOTATED_VALUE @onEnumValue
+        OTHER_VALUE
+      }
 
-enum UndefinedEnum
+      enum UndefinedEnum
 
-extend enum Site {
-  VR
-}
+      extend enum Site {
+        VR
+      }
 
-extend enum Site @onEnum
+      extend enum Site @onEnum
 
-input InputType {
-  key: String!
-  answer: Int = 42
-}
+      input InputType {
+        key: String!
+        answer: Int = 42
+      }
 
-input AnnotatedInput @onInputObject {
-  annotatedField: Type @onField
-}
+      input AnnotatedInput @onInputObject {
+        annotatedField: Type @onField
+      }
 
-input UndefinedInput
+      input UndefinedInput
 
-extend input InputType {
-  other: Float = 1.23e4
-}
+      extend input InputType {
+        other: Float = 1.23e4
+      }
 
-extend input InputType @onInputObject
+      extend input InputType @onInputObject
 
-directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+      directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+      directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
-directive @include2(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
-`,
-    );
+      directive @include2(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+    `);
   });
 });
diff --git a/src/subscription/subscribe.js b/src/subscription/subscribe.js
@@ -84,6 +84,7 @@ export function subscribe(
   fieldResolver,
   subscribeFieldResolver,
 ) {
+  /* eslint-enable no-redeclare */
   // Extract arguments from object args if provided.
   return arguments.length === 1
     ? subscribeImpl(
diff --git a/src/type/__tests__/validation-test.js b/src/type/__tests__/validation-test.js
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// 80+ char lines are useful in describe/it, so ignore in this file.
-/* eslint-disable max-len */
-
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
 import {
diff --git a/src/utilities/__tests__/schemaPrinter-test.js b/src/utilities/__tests__/schemaPrinter-test.js
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// 80+ char lines are useful in describe/it, so ignore in this file.
-/* eslint-disable max-len */
-
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
 import dedent from '../../jsutils/dedent';
diff --git a/src/validation/__tests__/ExecutableDefinitions-test.js b/src/validation/__tests__/ExecutableDefinitions-test.js
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// 80+ char lines are useful in tests, so ignore in this file.
-/* eslint-disable max-len */
-
 import { describe, it } from 'mocha';
 import { expectPassesRule, expectFailsRule } from './harness';
 import {
diff --git a/src/validation/__tests__/KnownDirectives-test.js b/src/validation/__tests__/KnownDirectives-test.js
@@ -5,9 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// 80+ char lines are useful in tests, so ignore in this file.
-/* eslint-disable max-len */
-
 import { describe, it } from 'mocha';
 import { expectPassesRule, expectFailsRule } from './harness';
 import {

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ function expectSyntaxError(text, message, location) {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-/* eslint-disable max-len */`
`29`		`-`
`30`	`28`	`describe('Lexer', () => {`
`31`	`29`	`it('disallows uncommon control characters', () => {`
`32`	`30`	`expectSyntaxError(`