Remove keywords from reserved names

eclipse-langium · Nov 2, 2022 · 17699dc · 17699dc
1 parent 48b6787
commit 17699dc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 71 deletions.
diff --git a/packages/langium/src/grammar/langium-grammar-validator.ts b/packages/langium/src/grammar/langium-grammar-validator.ts
@@ -49,7 +49,7 @@ export class LangiumGrammarValidationRegistry extends ValidationRegistry {
                 validator.checkHiddenTerminalRule,
                 validator.checkEmptyTerminalRule
             ],
-            InferredType: validator.checkReservedTypeName,
+            InferredType: validator.checkTypeReservedName,
             Keyword: validator.checkKeyword,
             UnorderedGroup: validator.checkUnorderedGroup,
             Grammar: [
@@ -69,9 +69,9 @@ export class LangiumGrammarValidationRegistry extends ValidationRegistry {
             ],
             GrammarImport: validator.checkPackageImport,
             CharacterRange: validator.checkInvalidCharacterRange,
-            Interface: validator.checkReservedTypeName,
-            Type: validator.checkReservedTypeName,
-            TypeAttribute: validator.checkReservedTypeName,
+            Interface: validator.checkTypeReservedName,
+            Type: validator.checkTypeReservedName,
+            TypeAttribute: validator.checkTypeReservedName,
             RuleCall: [
                 validator.checkUsedHiddenTerminalRule,
                 validator.checkUsedFragmentTerminalRule,
@@ -566,7 +566,7 @@ export class LangiumGrammarValidator {
         }
     }
 
-    checkReservedTypeName(type: ast.Interface | ast.TypeAttribute | ast.Type | ast.InferredType, accept: ValidationAcceptor): void {
+    checkTypeReservedName(type: ast.Interface | ast.TypeAttribute | ast.Type | ast.InferredType, accept: ValidationAcceptor): void {
         this.checkReservedName(type, 'name', accept);
     }
 
@@ -723,57 +723,6 @@ function isEmptyRule(rule: ast.AbstractRule): boolean {
 }
 
 const reservedNames = new Set([
-    // Keywords
-    'abstract',
-    'arguments',
-    'async',
-    'await',
-    'break',
-    'byte',
-    'case',
-    'catch',
-    'class',
-    'const',
-    'continue',
-    'debugger',
-    'default',
-    'delete',
-    'do',
-    'else',
-    'enum',
-    'export',
-    'extends',
-    'false',
-    'finally',
-    'for',
-    'function',
-    'if',
-    'implements',
-    'import',
-    'in',
-    'instanceof',
-    'interface',
-    'let',
-    'long',
-    'new',
-    'null',
-    'package',
-    'private',
-    'protected',
-    'public',
-    'return',
-    'static',
-    'super',
-    'switch',
-    'this',
-    'throw',
-    'try',
-    'typeof',
-    'var',
-    'void',
-    'while',
-    'with',
-    'yield',
     // Built-in objects, properties and methods
     // Collections
     'Array',
@@ -845,16 +794,5 @@ const reservedNames = new Set([
     'Date',
     'Intl',
     'eval',
-    'prototype',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'length',
-    'toString',
-    'undefined',
-    'valueOf',
-    'clearInterval',
-    'setInterval',
-    'clearTimeout',
-    'setTimeout',
-    'process',
+    'undefined'
 ]);
diff --git a/packages/langium/test/grammar/langium-grammar-validator.test.ts b/packages/langium/test/grammar/langium-grammar-validator.test.ts
@@ -330,7 +330,7 @@ describe('Reserved names', () => {
     });
 
     test('Reserved assignment feature', async () => {
-        const text = 'X: await="X";';
+        const text = 'X: Map="X";';
         expectReservedName(await validate(text), GrammarAST.isAssignment, 'feature');
     });
 
@@ -340,7 +340,7 @@ describe('Reserved names', () => {
     });
 
     test('Reserved action feature', async () => {
-        const text = 'X: Y {infer Z.async=current} name="X"; Y: name="Y";';
+        const text = 'X: Y {infer Z.Map=current} name="X"; Y: name="Y";';
         expectReservedName(await validate(text), GrammarAST.isAction, 'feature');
     });
 
@@ -356,7 +356,7 @@ describe('Reserved names', () => {
     });
 
     test('Reserved type attribute name', async () => {
-        const text = 'interface X { async: number }';
+        const text = 'interface X { Map: number }';
         expectReservedName(await validate(text), GrammarAST.isTypeAttribute, 'name');
     });