enable unicorn/prefer-regexp-test rule

graphql · Feb 25, 2023 · 73c54fe · 73c54fe
1 parent c4b480e
commit 73c54fe
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -255,6 +255,7 @@ module.exports = {
       'always',
       { enforceForIfStatements: true },
     ],
+    'unicorn/prefer-regexp-test': 'error',
     'unicorn/prefer-export-from': ['error', { ignoreUsedVariables: true }],
     'unicorn/throw-new-error': 'error',
     'unicorn/prefer-includes': 'error',

diff --git a/packages/graphql-language-service/src/parser/RuleHelpers.ts b/packages/graphql-language-service/src/parser/RuleHelpers.ts
@@ -21,7 +21,7 @@ export function list(ofRule: Rule | string, separator?: string | Rule): Rule {
   return { ofRule, isList: true, separator };
 }
 
-// An constraint described as `but not` in the GraphQL spec.
+// A constraint described as `but not` in the GraphQL spec.
 export function butNot(rule: Rule, exclusions: Array<Rule>) {
   const ruleMatch = rule.match;
   rule.match = token => {
@@ -31,6 +31,7 @@ export function butNot(rule: Rule, exclusions: Array<Rule>) {
     }
     return (
       check &&
+      // eslint-disable-next-line unicorn/prefer-regexp-test -- false positive exclusion is not string
       exclusions.every(exclusion => exclusion.match && !exclusion.match(token))
     );
   };

diff --git a/packages/graphql-language-service/src/parser/__tests__/RuleHelpers-test.ts b/packages/graphql-language-service/src/parser/__tests__/RuleHelpers-test.ts
@@ -24,8 +24,7 @@ describe('list', () => {
 describe('butNot', () => {
   const rule = {
     match: token =>
-      token.kind === 'Name' &&
-      Boolean(token.value.match(/^[_A-Za-z][_0-9A-Za-z]*/)),
+      token.kind === 'Name' && /^[_A-Za-z][_0-9A-Za-z]*/.test(token.value),
   };
 
   const exclusionRules = [

diff --git a/packages/graphql-language-service/src/parser/onlineParser.ts b/packages/graphql-language-service/src/parser/onlineParser.ts
@@ -79,6 +79,7 @@ function getToken(
   options: ParserOptions,
 ): string {
   if (state.inBlockstring) {
+    // eslint-disable-next-line unicorn/prefer-regexp-test -- false positive stream is not string
     if (stream.match(/.*"""/)) {
       state.inBlockstring = false;
       return 'string';

diff --git a/packages/vscode-graphql-execution/src/providers/exec-content.ts b/packages/vscode-graphql-execution/src/providers/exec-content.ts
@@ -115,7 +115,7 @@ export class GraphQLContentProvider implements TextDocumentContentProvider {
       });
   }
   validUrlFromSchema(pathOrUrl: string) {
-    return Boolean(pathOrUrl.match(/^https?:\/\//g));
+    return /^https?:\/\//.test(pathOrUrl);
   }
   reportError(message: string) {
     this.outputChannel.appendLine(message);