Выделение директив компилятора красным #145

Pr-Mex · Dec 25, 2022 · 5ecd6a0 · 5ecd6a0
1 parent 8792a2d
commit 5ecd6a0
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 0 deletions.
diff --git a/example/VAEditorSample/Forms/MainForm/Ext/Form/Module.bsl b/example/VAEditorSample/Forms/MainForm/Ext/Form/Module.bsl
@@ -734,6 +734,25 @@ Function GetMetatags()
 
 EndFunction
 
+&AtClient
+Function GetDirectives()
+
+ words = "
+ |#Если
+ |#ИначеЕсли
+ |#Иначе
+ |#КонецЕсли
+ |";
+
+ split = "
+ |";
+
+ Directives = StrSplit(words, split, False);
+
+ Return JsonDump(Directives);
+
+EndFunction
+
 &AtServer
 Function VanessaStepList(language)
 
@@ -817,6 +836,7 @@ Procedure VanessaEditorDocumentComplete(Item)
  Provider.setKeywords(GetKeywords());
  Provider.setElements(GetElements());
  Provider.setVariables(GetVariables());
+ Provider.setDirectives(GetDirectives());
  Provider.setMessages(MessagesJSON);
  LoadStepsAll(Undefined);
 

diff --git a/src/languages/turbo-gherkin/configuration.ts b/src/languages/turbo-gherkin/configuration.ts
@@ -40,6 +40,8 @@ export class GherkinLanguage {
  this.tokenizer.keyword.push([provider.matcher.import, { token: "keyword", next: "@operator" }]);
  this.tokenizer.keyword.push([provider.matcher.step, { token: "keyword", next: "@operator" }]);
  this.tokenizer.feature[0] = [provider.matcher.primary, { token: "metatag.php", next: "@root" }];
+ if (provider.matcher.directives)
+ this.tokenizer.section.push([provider.matcher.directives, { token: "metatag", next: "@operator" }])
  }
 
  tokenizer = {

diff --git a/src/languages/turbo-gherkin/matcher.ts b/src/languages/turbo-gherkin/matcher.ts
@@ -13,6 +13,7 @@ export class KeywordMatcher {
  public section = new Section;
  public keypairs: RegExp[];
  public metatags: RegExp;
+ public directives: RegExp;
  public primary: RegExp;
  public import: RegExp;
  public step: RegExp;
@@ -98,6 +99,11 @@ export class KeywordMatcher {
  this.metatags = this.regex(metatags);
  }
 
+ public setDirectives(words: string[]) {
+ this.directives = words.length === 0 ?
+ null : this.regex(words, "(\\s+.*$|$)");
+ }
+
  public setKeypairs(keypairs: any) {
  this.keypairs = [];
  Object.keys(keypairs).forEach((key: string) => {

diff --git a/src/languages/turbo-gherkin/provider.ts b/src/languages/turbo-gherkin/provider.ts
@@ -63,6 +63,7 @@ export class VanessaGherkinProvider {
  public get keypairs(): any { return this._keypairs; }
 
  private _metatags: string[] = ["try", "except", "попытка", "исключение"];
+ private _directives: string[] = [];
  private _keypairs: any = {};
  private _errorLinks = [];
  private _matcher: KeywordMatcher;
@@ -76,6 +77,10 @@ export class VanessaGherkinProvider {
  return this._locale;
  }
 
+ public get directives(): string[] {
+ return this._directives;
+ }
+
  public setErrorLinks = (arg: string): void => {
  const commands = JSON.parse(arg)
  this.clearArray(this.errorLinks);
@@ -113,6 +118,13 @@ export class VanessaGherkinProvider {
  worker.postMessage({ type: MessageType.SetMetatags, data: this.metatags });
  }
 
+ public setDirectives = (arg: string): void => {
+ this._directives = [];
+ let list = JSON.parse(arg);
+ list.forEach((w: string) => this._directives.push(w));
+ this.matcher?.setDirectives(this.directives);
+ }
+
  public setMessages = (arg: string): void => {
  worker.postMessage({ type: MessageType.SetMessages, data: arg });
  }

diff --git a/test/demo/editor-demo.ts b/test/demo/editor-demo.ts
@@ -27,8 +27,11 @@ export function show() {
  soundHint: "Озвучить"
  }
 
+ const directives = ["#Если", "#Иначе", "#ИначеЕсли", "#КонецЕсли"]
+
  const keypairs = { if: ['then'], Если: ['Тогда'] }
 
+ provider.setDirectives(JSON.stringify(directives))
  provider.setElements(JSON.stringify(elements))
  provider.setKeypairs(JSON.stringify(keypairs))
  provider.setMessages(JSON.stringify(messages))

diff --git a/test/demo/example.feature b/test/demo/example.feature
@@ -48,3 +48,9 @@
  И вот почему видеовставка картинки "ИмяКартинки" "ТекстДиктора"
  И это значит что в таблице "$ИмяТаблицы$" есть колонка с именем '$ИмяРеквизита$'
  Если в панели открытых есть команда "ЗаписатьИЗакрыть" Тогда
+
+#Если ЭтоКлиент Тогда
+ Если в панели открытых есть команда "ЗаписатьИЗакрыть" Тогда
+#Иначе
+ Если Версия платформы ">=" "8.3.6" Тогда
+#КонецЕсли