Skip to content

Commit

Permalink
Исправлена обработка многословных ключевых слов
Browse files Browse the repository at this point in the history
  • Loading branch information
lintest committed Mar 10, 2021
1 parent 07e847c commit 00658d2
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/languages/turbo-gherkin/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export class VanessaGherkinProvider {
if (words.length == 0) return undefined;
let result = undefined;
this.keywords.forEach((item: string[]) => {
if (item.every((w: string, i: number) => words[i] && w == words[i].toLowerCase())) result = item;
if (!result && item.every((w: string, i: number) => words[i] && w == words[i].toLowerCase())) result = item;
});
return result;
}
Expand Down Expand Up @@ -580,14 +580,14 @@ export class VanessaGherkinProvider {
let words = this.splitWords(line);
let keyword = this.findKeyword(words);
if (keyword && keyword.length > 1) {
let regexp = "^[\\s]*";
keyword.forEach(w => regexp += w + "[\\s]*");
let regexp = "^";
keyword.forEach((w, i) => regexp += "[\\s]" + (i ? "+" : "*") + w);
let match = line.toLowerCase().match(new RegExp(regexp));
if (match) {
line = "if";
let text = "";
let length = match[0].length;
for (let i = 2; i < length; i++) line += " ";
line += line.substring(length);
for (let i = 2; i < length; ++i) text += " ";
line = text + "if" + line.substring(length);
}
}
let tokens = [];
Expand Down

0 comments on commit 00658d2

Please sign in to comment.