From 69f0aa9691e94e676bf496361130cfdff0ebdebb Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Tue, 4 Mar 2025 17:39:10 +0200
Subject: [PATCH] refactoring

---
 .../calculated-fields-table-config.ts                |  3 ++-
 .../pages/scada-symbol/scada-symbol-editor.models.ts |  3 ++-
 .../src/app/shared/components/js-func.component.ts   |  4 ++++
 ui-ngx/src/app/shared/models/ace/ace.models.ts       |  3 ---
 .../src/app/shared/models/calculated-field.models.ts | 12 ------------
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
index 6c0e378f57..83c354136a 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
@@ -44,7 +44,8 @@ import {
   CalculatedFieldTestScriptDialogData,
   getCalculatedFieldArgumentsEditorCompleter,
   getCalculatedFieldArgumentsHighlights,
-  CalculatedFieldTypeTranslations, CalculatedFieldType,
+  CalculatedFieldTypeTranslations,
+  CalculatedFieldType,
 } from '@shared/models/calculated-field.models';
 import {
   CalculatedFieldDebugDialogComponent,
diff --git a/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts b/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts
index cc5a9baf4f..6fd0219315 100644
--- a/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts
+++ b/ui-ngx/src/app/modules/home/pages/scada-symbol/scada-symbol-editor.models.ts
@@ -36,7 +36,6 @@ import {
   AceHighlightRules,
   dotOperatorHighlightRule,
   endGroupHighlightRule,
-  identifierRe
 } from '@shared/models/ace/ace.models';
 import { HelpLinks, ValueType } from '@shared/models/constants';
 import { formPropertyCompletions } from '@shared/models/dynamic-form.models';
@@ -925,6 +924,8 @@ export class ScadaSymbolElement {
 
 }
 
+const identifierRe = /[a-zA-Z$_\u00a1-\uffff][a-zA-Z\d$_\u00a1-\uffff]*/;
+
 const scadaSymbolCtxObjectHighlightRule: AceHighlightRule = {
   token: 'tb.scada-symbol-ctx',
   regex: /\bctx\b/,
diff --git a/ui-ngx/src/app/shared/components/js-func.component.ts b/ui-ngx/src/app/shared/components/js-func.component.ts
index 7c7d14eff5..eccb5cb908 100644
--- a/ui-ngx/src/app/shared/components/js-func.component.ts
+++ b/ui-ngx/src/app/shared/components/js-func.component.ts
@@ -587,6 +587,10 @@ export class JsFuncComponent implements OnInit, OnChanges, OnDestroy, ControlVal
           newMode.$highlightRules.$rules[group] = this.highlightRules[group];
         }
       }
+      const identifierRule = newMode.$highlightRules.$rules.no_regex.find(rule => rule.token?.includes('identifier'));
+      if (identifierRule) {
+        identifierRule.next = 'start';
+      }
       // @ts-ignore
       this.jsEditor.session.$onChangeMode(newMode);
     }
diff --git a/ui-ngx/src/app/shared/models/ace/ace.models.ts b/ui-ngx/src/app/shared/models/ace/ace.models.ts
index 9533f80d51..49cf670989 100644
--- a/ui-ngx/src/app/shared/models/ace/ace.models.ts
+++ b/ui-ngx/src/app/shared/models/ace/ace.models.ts
@@ -376,7 +376,4 @@ export const endGroupHighlightRule: AceHighlightRule = {
   next: 'no_regex'
 };
 
-export const identifierRe = /[a-zA-Z$_\u00a1-\uffff][a-zA-Z\d$_\u00a1-\uffff]*/;
-
-
 
diff --git a/ui-ngx/src/app/shared/models/calculated-field.models.ts b/ui-ngx/src/app/shared/models/calculated-field.models.ts
index 21d2b6b588..a66d6f74c6 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -33,7 +33,6 @@ import {
   AceHighlightRules,
   dotOperatorHighlightRule,
   endGroupHighlightRule,
-  identifierRe
 } from '@shared/models/ace/ace.models';
 
 export interface CalculatedField extends Omit<BaseData<CalculatedFieldId>, 'label'>, HasVersion, HasEntityDebugSettings, HasTenantId, ExportableEntity<CalculatedFieldId> {
@@ -536,17 +535,6 @@ export const getCalculatedFieldArgumentsHighlights = (
         ? 'calculatedFieldRollingArgumentValue'
         : 'calculatedFieldSingleArgumentValue'
     })),
-    no_regex: [
-      {
-        token: 'tb.identifier',
-        regex: identifierRe,
-      },
-      {
-        token: 'tb.paren.lparen',
-        regex: '\\(',
-        next: 'start'
-      }
-    ],
     ...calculatedFieldSingleArgumentValueHighlightRules,
     ...calculatedFieldRollingArgumentValueHighlightRules,
     ...calculatedFieldTimeWindowArgumentValueHighlightRules