Move getActionAtElement

eclipse-langium · Sep 28, 2023 · 9d6a154 · 9d6a154
1 parent 80a51c0
commit 9d6a154
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/packages/langium/src/grammar/internal-grammar-util.ts b/packages/langium/src/grammar/internal-grammar-util.ts
@@ -8,7 +8,7 @@ import { URI } from '../utils/uri-util.js';
 import type { LangiumDocuments } from '../workspace/documents.js';
 import type { AstNode } from '../syntax-tree.js';
 import * as ast from '../grammar/generated/ast.js';
-import { getDocument, streamAllContents } from '../utils/ast-util.js';
+import { getDocument } from '../utils/ast-util.js';
 import { UriUtils } from '../utils/uri-util.js';
 import type { LangiumGrammarServices} from './langium-grammar-module.js';
 import { createLangiumGrammarServices } from './langium-grammar-module.js';
@@ -64,30 +64,6 @@ function isStringTypeInternal(type: ast.AbstractType | ast.TypeDefinition, visit
     return false;
 }
 
-export function getActionAtElement(element: ast.AbstractElement): ast.Action | undefined {
-    const parent = element.$container;
-    if (ast.isGroup(parent)) {
-        const elements = parent.elements;
-        const index = elements.indexOf(element);
-        for (let i = index - 1; i >= 0; i--) {
-            const item = elements[i];
-            if (ast.isAction(item)) {
-                return item;
-            } else {
-                const action = streamAllContents(elements[i]).find(ast.isAction);
-                if (action) {
-                    return action;
-                }
-            }
-        }
-    }
-    if (ast.isAbstractElement(parent)) {
-        return getActionAtElement(parent);
-    } else {
-        return undefined;
-    }
-}
-
 export function getTypeNameWithoutError(type?: ast.AbstractType | ast.InferredType): string | undefined {
     if (!type) {
         return undefined;

diff --git a/packages/langium/src/grammar/references/grammar-references.ts b/packages/langium/src/grammar/references/grammar-references.ts
@@ -14,11 +14,11 @@ import type { FindReferencesOptions } from '../../references/references.js';
 import { DefaultReferences } from '../../references/references.js';
 import { getContainerOfType, getDocument } from '../../utils/ast-util.js';
 import { toDocumentSegment } from '../../utils/cst-util.js';
-import { findAssignment, findNodeForProperty } from '../../utils/grammar-util.js';
+import { findAssignment, findNodeForProperty, getActionAtElement } from '../../utils/grammar-util.js';
 import { stream } from '../../utils/stream.js';
 import { UriUtils } from '../../utils/uri-util.js';
 import { isAction, isAssignment, isInterface, isParserRule, isType, isTypeAttribute } from '../generated/ast.js';
-import { extractAssignments, getActionAtElement } from '../internal-grammar-util.js';
+import { extractAssignments } from '../internal-grammar-util.js';
 import { collectChildrenTypes, collectSuperTypes } from '../type-system/types-util.js';
 
 export class LangiumGrammarReferences extends DefaultReferences {

diff --git a/packages/langium/src/utils/grammar-util.ts b/packages/langium/src/utils/grammar-util.ts
@@ -269,6 +269,30 @@ function findNameAssignmentInternal(type: ast.AbstractType, cache: Map<ast.Abstr
     return undefined;
 }
 
+export function getActionAtElement(element: ast.AbstractElement): ast.Action | undefined {
+    const parent = element.$container;
+    if (ast.isGroup(parent)) {
+        const elements = parent.elements;
+        const index = elements.indexOf(element);
+        for (let i = index - 1; i >= 0; i--) {
+            const item = elements[i];
+            if (ast.isAction(item)) {
+                return item;
+            } else {
+                const action = streamAllContents(elements[i]).find(ast.isAction);
+                if (action) {
+                    return action;
+                }
+            }
+        }
+    }
+    if (ast.isAbstractElement(parent)) {
+        return getActionAtElement(parent);
+    } else {
+        return undefined;
+    }
+}
+
 export type Cardinality = '?' | '*' | '+' | undefined;
 export type Operator = '=' | '+=' | '?=' | undefined;
 

diff --git a/packages/langium/test/grammar/lsp/grammar-formatter.test.ts b/packages/langium/test/grammar/lsp/grammar-formatter.test.ts
@@ -5,7 +5,8 @@
 ******************************************************************************/
 
 import { describe, test } from 'vitest';
-import { EmptyFileSystem, createLangiumGrammarServices, expandToString } from 'langium';
+import { EmptyFileSystem, expandToString } from 'langium';
+import { createLangiumGrammarServices } from 'langium/grammar';
 import { expectFormatting } from 'langium/test';
 
 const services = createLangiumGrammarServices(EmptyFileSystem);

diff --git a/packages/langium/test/parser/langium-parser-builder.test.ts b/packages/langium/test/parser/langium-parser-builder.test.ts
@@ -6,10 +6,9 @@
 
 import type { TokenType, TokenVocabulary } from 'chevrotain';
 import type { AstNode, Grammar, GrammarAST, LangiumParser, TokenBuilderOptions } from 'langium';
-import { createLangiumGrammarServices, EmptyFileSystem, createServicesForGrammar, DefaultTokenBuilder} from 'langium';
+import { EmptyFileSystem, DefaultTokenBuilder } from 'langium';
 import { describe, expect, test, onTestFailed, beforeEach } from 'vitest';
-import { DefaultTokenBuilder } from 'langium';
-import { createServicesForGrammar } from 'langium/grammar';
+import { createLangiumGrammarServices, createServicesForGrammar } from 'langium/grammar';
 import { parseHelper } from 'langium/test';
 import { EOF } from 'chevrotain';