Назначение директив СППР

Pr-Mex · Feb 26, 2023 · 9eb6c58 · 9eb6c58
1 parent 17dce0c
commit 9eb6c58
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/languages/turbo-gherkin/common.ts b/src/languages/turbo-gherkin/common.ts
@@ -12,6 +12,7 @@ export function getLineMaxColumn(line: string): number {
 
 export interface IWorkerContext {
  matcher: KeywordMatcher;
+ directives: ISpprDirect;
  metatags: string[];
  steplist: any;
  keypairs: any;
@@ -77,6 +78,7 @@ export enum MessageType {
  SetKeypairs,
  SetMessages,
  SetVariables,
+ SetDirectives,
  UpdateModel,
  DeleteModel,
  GetCodeActions,
@@ -99,6 +101,7 @@ export function type2str(type: MessageType) {
  case MessageType.SetKeypairs: return "SetKeypairs";
  case MessageType.SetMessages: return "SetMessages";
  case MessageType.SetVariables: return "SetVariables";
+ case MessageType.SetDirectives: return "SetDirectives";
  case MessageType.UpdateModel: return "UpdateModel";
  case MessageType.DeleteModel: return "DeleteModel";
  case MessageType.GetCodeActions: return "GetCodeActions";
@@ -120,6 +123,7 @@ export type WorkerMessage =
  | { id?: number, type: MessageType.SetMessages, data: any }
  | { id?: number, type: MessageType.SetElements, values: string, clear: boolean }
  | { id?: number, type: MessageType.SetVariables, values: string, clear: boolean }
+ | { id?: number, type: MessageType.SetDirectives, data: any }
  | { id?: number, type: MessageType.SetImports, data: any }
  | { id?: number, type: MessageType.UpdateModel, versionId: number, uri: string }
  | { id?: number, type: MessageType.DeleteModel, uri: string }

diff --git a/src/languages/turbo-gherkin/model.ts b/src/languages/turbo-gherkin/model.ts
@@ -1,5 +1,5 @@
 import { IWorkerModel, VAIndent, VAToken } from "./common";
-import { KeywordMatcher } from "./matcher";
+import { IDirectExp, KeywordMatcher } from "./matcher";
 
 function getIndent(text: string, tabSize: number) {
  let indent = 0;
@@ -12,7 +12,7 @@ function getIndent(text: string, tabSize: number) {
  return indent + 1;
 }
 
-function getToken(text: string, sppr: boolean) {
+function getToken(text: string, sppr: boolean, direct: IDirectExp) {
  if (sppr) {
  if (/^\s*\/\*.*$/.test(text)) return VAToken.StartComment;
  if (/^.*\*\/\s*/.test(text)) return VAToken.EndComment;
@@ -37,7 +37,7 @@ export function getModelTokens(
  const lineCount = model.getLineCount();
  for (let lineNumber = 1; lineNumber <= lineCount; lineNumber++) {
  let text = model.getLineContent(lineNumber);
- let token = getToken(text, matcher.sppr);
+ let token = getToken(text, matcher.sppr, matcher.directives);
  if (multilineParam) {
  if (token == VAToken.Multiline) {
  multilineParam = false;

diff --git a/src/languages/turbo-gherkin/provider.ts b/src/languages/turbo-gherkin/provider.ts
@@ -99,6 +99,7 @@ export class VanessaGherkinProvider {
  }
 
  public setDirectives = (arg: string): void => {
+ worker.postMessage({ type: MessageType.SetDirectives, data: arg });
  this._directives = JSON.parse(arg) as ISpprDirect;
  this.matcher?.setDirectives(this.directives);
  }

diff --git a/src/languages/turbo-gherkin/worker.ts b/src/languages/turbo-gherkin/worker.ts
@@ -11,6 +11,7 @@ import { setStepList, updateStepLabels } from './steplist';
 
 const context: IWorkerContext = {
  matcher: undefined,
+ directives: {},
  metatags: ["try", "except", "попытка", "исключение"],
  steplist: {},
  keypairs: {},
@@ -85,11 +86,16 @@ export function process(msg: WorkerMessage) {
  return { id: msg.id, data: { suggestions }, success: true };
  case MessageType.SetKeywords:
  context.matcher = new KeywordMatcher(msg.data);
+ context.matcher.setDirectives(context.directives);
  context.matcher.setKeypairs(context.keypairs);
  context.matcher.setMetatags(context.metatags)
- context.matcher.setSPPR(context.sppr)
+ context.matcher.setSPPR(context.sppr);
  updateStepLabels(context);
  break;
+ case MessageType.SetDirectives:
+ context.directives = JSON.parse(msg.data);
+ context.matcher?.setDirectives(context.directives)
+ break;
  case MessageType.SetKeypairs:
  context.keypairs = msg.data;
  context.matcher?.setKeypairs(context.keypairs);