1c/bsl_console
1
0
Fork 0
mirror of https://github.com/salexdv/bsl_console.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Замена findMatches -> regexp (Finder)

Browse Source
This commit is contained in:
salexdv 2022-01-25 07:55:12 +03:00
parent ebeeaf6a2a
commit a104b72e01
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bsl_helper.js
View File

@ -6155,7 +6155,7 @@ class bslHelper {
let document_colors = [];
let pattern = 'WebЦвета\.([a-zA-Z\u0410-\u044F]+)|WebColors\.([a-zA-Z\u0410-\u044F]+)|Новый Цвет\\s*\\((.*?)\\)|New Color\\s*\\((.*?)\\)';
let matches = model.findMatches(pattern, false, true, false, null, true);
let matches = Finder.findMatches(model, pattern);
for (let idx = 0; idx < matches.length; idx++) {
@ -6217,7 +6217,7 @@ class bslHelper {
let pattern = 'WebЦвета\.([a-zA-Z\u0410-\u044F]+)|WebColors\.([a-zA-Z\u0410-\u044F]+)|Новый Цвет\\s*\\((.*?)\\)|New Color\\s*\\((.*?)\\)';
let range = colorInfo.range;
let match = model.findNextMatch(pattern, new monaco.Position(range.startLineNumber, range.startColumn), true, false, null, true);
let match = Finder.findNextMatch(model, pattern, new monaco.Position(range.startLineNumber, range.startColumn));
let color = colorInfo.color;
let red = Math.round(color.red * 255);
@ -6331,7 +6331,7 @@ class bslHelper {
pattern = '(процедура|procedure|функция|function)\\s*' + this.word + '\\(';
let position = new monaco.Position(this.lineNumber, 1);
let match = this.model.findPreviousMatch(pattern, position, true);
let match = Finder.findPreviousMatch(this.model, pattern, position, false);
if (match && (is_function || match.range.startLineNumber < this.lineNumber)) {
location = [{
@ -6365,7 +6365,7 @@ class bslHelper {
let pattern = '(as|как)\\s*' + this.word;
let position = new monaco.Position(this.lineNumber, 1);
let match = this.model.findPreviousMatch(pattern, position, true);
let match = Finder.findPreviousMatch(this.model, pattern, position, false);
if (match && match.range.startLineNumber < this.lineNumber) {
location = [{
@ -6379,7 +6379,7 @@ class bslHelper {
let pattern = '(as|как)\\s*' + this.word;
let position = new monaco.Position(this.lineNumber, this.model.getLineMaxColumn(this.lineNumber));
let match = this.model.findNextMatch(pattern, position, true);
let match = Finder.findNextMatch(this.model, pattern, position, false);
if (match && match.range.startLineNumber > this.lineNumber) {
location = [{
@ -6393,7 +6393,7 @@ class bslHelper {
let pattern = '(поместить|into)[\\s\\n\\t]*' + this.word;
let position = new monaco.Position(this.lineNumber, 1);
let match = this.model.findNextMatch(pattern, position, true);
let match = Finder.findPreviousMatch(this.model, pattern, position, false);
if (match && match.range.startLineNumber < this.lineNumber) {
location = [{