Remove UppercaseDirectives and fix DirectiveCase

codefori · Feb 4, 2024 · 745c321 · 745c321
1 parent e2cc17e
commit 745c321
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 62 deletions.
diff --git a/extension/server/src/providers/linter/index.ts b/extension/server/src/providers/linter/index.ts
@@ -314,8 +314,7 @@ export function getActions(document: TextDocument, errors: IssueRange[]) {
 
 			case `SpecificCasing`:
 			case `IncorrectVariableCase`:
-			case `DirectiveCasing`:
-			case `UppercaseDirectives`:
+			case `DirectiveCase`:
 				if (error.newValue) {
 					action = CodeAction.create(`Correct casing to '${error.newValue}'`, CodeActionKind.QuickFix);
 					action.edit = {

diff --git a/language/linter.ts b/language/linter.ts
@@ -26,8 +26,7 @@ const errorText = {
   'StringLiteralDupe': `Same string literal used more than once. Consider using a constant instead.`,
   'RequireBlankSpecial': `\`*BLANK\` should be used over empty string literals.`,
   'CopybookDirective': `Directive does not match requirement.`,
-  'DirectiveCasing': `Does not match required case.`,
-  'UppercaseDirectives': `Directives must be in uppercase. UppercaseDirectives option is deprecated, consider using DirectiveCasing.`,
+  'DirectiveCase': `Does not match required case.`,
   'NoSQLJoins': `SQL joins are not allowed. Consider creating a view instead.`,
   'NoGlobalsInProcedures': `Global variables should not be referenced in procedures.`,
   'NoCTDATA': `\`CTDATA\` is not allowed.`,
@@ -285,7 +284,7 @@ export default class Linter {
                     if (rules.CopybookDirective) {
                       let correctDirective = `/${rules.CopybookDirective.toUpperCase()}`;
                       let correctValue = value.toUpperCase();
-                      if (rules.DirectiveCasing === `lower`) {
+                      if (rules.DirectiveCase === `lower`) {
                         correctDirective = correctDirective.toLowerCase();
                         correctValue = value.toLowerCase();
                       }
@@ -300,31 +299,21 @@ export default class Linter {
                   }
                 }
 
-                if (rules.DirectiveCasing === `lower`) {
+                if (rules.DirectiveCase === `lower`) {
                   if (value !== value.toLowerCase()) {
                     errors.push({
                       offset: { position: statement[0].range.start, end: statement[0].range.end },
-                      type: `DirectiveCasing`,
+                      type: `DirectiveCase`,
                       newValue: value.toLowerCase()
                     });
                   }
                 }
 
-                if (rules.DirectiveCasing === `upper`) {
+                if (rules.DirectiveCase === `upper`) {
                   if (value !== value.toUpperCase()) {
                     errors.push({
                       offset: { position: statement[0].range.start, end: statement[0].range.end },
-                      type: `DirectiveCasing`,
-                      newValue: value.toUpperCase()
-                    });
-                  }
-                }
-
-                if (rules.UppercaseDirectives) {
-                  if (value !== value.toUpperCase()) {
-                    errors.push({
-                      offset: { position: statement[0].range.start, end: statement[0].range.end },
-                      type: `UppercaseDirectives`,
+                      type: `DirectiveCase`,
                       newValue: value.toUpperCase()
                     });
                   }

diff --git a/language/parserTypes.ts b/language/parserTypes.ts
@@ -41,8 +41,7 @@ export interface Rules {
   literalMinimum?: number;
   RequireBlankSpecial?: boolean;
   CopybookDirective?: "copy"|"include";
-  DirectiveCasing?: "lower"|"upper";
-  UppercaseDirectives?: boolean;
+  DirectiveCase?: "lower"|"upper";
   NoSQLJoins?: boolean;
   NoGlobalsInProcedures?: boolean;
   SpecificCasing?: {operation: string, expected: string}[];

diff --git a/package-lock.json b/package-lock.json
diff --git a/tests/suite/directives.js b/tests/suite/directives.js
@@ -520,53 +520,20 @@ module.exports = {
 
     const cache = await parser.getDocs(uri, lines, {withIncludes: true, ignoreCache: true});
     const { errors } = Linter.getErrors({ uri, content: lines }, {
-      DirectiveCasing: `upper`
+      DirectiveCase: `upper`
     }, cache);
 
     assert.strictEqual(errors.length, 2, `Expect length of 2`);
 
     assert.deepStrictEqual(errors[0], {
       offset: { position: 31, end: 36 },
-      type: `DirectiveCasing`,
+      type: `DirectiveCase`,
       newValue: `/COPY`
     });
 
     assert.deepStrictEqual(errors[1], {
       offset: { position: 65, end: 70 },
-      type: `DirectiveCasing`,
-      newValue: `/COPY`
-    });
-  },
-
-  uppercase2: async () => {
-    const lines = [
-      `**FREE`,
-      `Ctl-Opt DftActGrp(*No);`,
-      `/copy './tests/rpgle/copy1.rpgle'`,
-      `/Copy './tests/rpgle/copy2.rpgle'`,
-      `/COPY './tests/rpgle/copy3.rpgle'`,
-      `Dcl-S MyCustomerName1 like(CustomerName_t);`,
-      `MyCustomerName1 = 'John Smith';`,
-      `dsply MyCustomerName1;`,
-      `Return;`
-    ].join(`\n`);
-
-    const cache = await parser.getDocs(uri, lines, {withIncludes: true, ignoreCache: true});
-    const { errors } = Linter.getErrors({ uri, content: lines }, {
-      UppercaseDirectives: true
-    }, cache);
-
-    assert.strictEqual(errors.length, 2, `Expect length of 2`);
-
-    assert.deepStrictEqual(errors[0], {
-      offset: { position: 31, end: 36 },
-      type: `UppercaseDirectives`,
-      newValue: `/COPY`
-    });
-
-    assert.deepStrictEqual(errors[1], {
-      offset: { position: 65, end: 70 },
-      type: `UppercaseDirectives`,
+      type: `DirectiveCase`,
       newValue: `/COPY`
     });
   },
@@ -586,20 +553,20 @@ module.exports = {
 
     const cache = await parser.getDocs(uri, lines, {withIncludes: true, ignoreCache: true});
     const { errors } = Linter.getErrors({ uri, content: lines }, {
-      DirectiveCasing: `lower`
+      DirectiveCase: `lower`
     }, cache);
 
     assert.strictEqual(errors.length, 2, `Expect length of 2`);
 
     assert.deepStrictEqual(errors[0], {
       offset: { position: 65, end: 70 },
-      type: `DirectiveCasing`,
+      type: `DirectiveCase`,
       newValue: `/copy`
     });
 
     assert.deepStrictEqual(errors[1], {
       offset: { position: 99, end: 104 },
-      type: `DirectiveCasing`,
+      type: `DirectiveCase`,
       newValue: `/copy`
     });
   }