diff --git a/packages/ttsl-lang/src/language/grammar/ttsl.langium b/packages/ttsl-lang/src/language/grammar/ttsl.langium index 9544948d..7dd5e7af 100644 --- a/packages/ttsl-lang/src/language/grammar/ttsl.langium +++ b/packages/ttsl-lang/src/language/grammar/ttsl.langium @@ -853,7 +853,7 @@ TslAnyType returns TslAnyType: // ----------------------------------------------------------------------------- terminal ID returns string: IDENTIFIER | '`' IDENTIFIER '`'; -terminal fragment IDENTIFIER: /[_a-zA-Z][_a-zA-Z0-9]*/; +terminal fragment IDENTIFIER: /[_a-zA-Zäöüß][_a-zA-Zäöüß0-9]*/; terminal FLOAT returns number : DECIMAL_DIGIT+ '.' DECIMAL_DIGIT+ FLOAT_EXPONENT? diff --git a/packages/ttsl-lang/src/language/validation/experimentalLanguageFeatures.ts b/packages/ttsl-lang/src/language/validation/experimentalLanguageFeatures.ts deleted file mode 100644 index fd1ffaa4..00000000 --- a/packages/ttsl-lang/src/language/validation/experimentalLanguageFeatures.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { AstUtils, ValidationAcceptor } from 'langium'; -import { - isTslDictionary, - type TslDictionary, -} from '../generated/ast.js'; -import { TTSLServices } from '../ttsl-module.js'; - -export const CODE_EXPERIMENTAL_LANGUAGE_FEATURE = 'experimental/language-feature'; - -export const mapsShouldBeUsedWithCaution = (services: TTSLServices) => { - const settingsProvider = services.workspace.SettingsProvider; - - return async (node: TslDictionary, accept: ValidationAcceptor) => { - if (!(await settingsProvider.shouldValidateExperimentalLanguageFeature())) { - /* c8 ignore next 2 */ - return; - } - - // There's already a warning on the container - if (AstUtils.hasContainerOfType(node.$container, isTslDictionary)) { - return; - } - - accept('warning', 'Map literals are experimental and may change without prior notice.', { - node, - code: CODE_EXPERIMENTAL_LANGUAGE_FEATURE, - }); - }; -}; \ No newline at end of file diff --git a/packages/ttsl-lang/src/language/validation/ttsl-validator.ts b/packages/ttsl-lang/src/language/validation/ttsl-validator.ts index 367fc7c9..85c8d67b 100644 --- a/packages/ttsl-lang/src/language/validation/ttsl-validator.ts +++ b/packages/ttsl-lang/src/language/validation/ttsl-validator.ts @@ -1,9 +1,6 @@ import { ValidationChecks } from 'langium'; import { TTSLAstType } from '../generated/ast.js'; import type { TTSLServices } from '../ttsl-module.js'; -import { - mapsShouldBeUsedWithCaution, -} from './experimentalLanguageFeatures.js'; import { moduleMemberMustHaveNameThatIsUniqueInPackage, moduleMustContainUniqueNames, @@ -113,7 +110,7 @@ export const registerValidationChecks = function (services: TTSLServices) { infixOperationOperandsMustHaveCorrectType(services), ], TslList: [listMustNotContainNamedTuples(services)], - TslDictionary: [mapMustNotContainNamedTuples(services), mapsShouldBeUsedWithCaution(services)], + TslDictionary: [mapMustNotContainNamedTuples(services)], TslModule: [ moduleMemberMustHaveNameThatIsUniqueInPackage(services), moduleMustContainUniqueNames,