Skip to content

Commit

Permalink
delay in extensions using key bindings contributions (#225)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bartosz-antosik
bartosz-antosik committed Nov 11, 2018
1 parent c3d7aba commit ded9cf9
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 19 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
@@ -1,7 +1,8 @@
# Change Log

## **3.0.10** released on 9th October 2018
## **3.0.10** released on 11th October 2018

- **Fix:** Huge delay in extensions using key bindings contributions ([#225](https://github.com/bartosz-antosik/vscode-spellright/issues/225)).
- **Fix:** Manually changing settings does not modify them in some cases ([#226](https://github.com/bartosz-antosik/vscode-spellright/issues/226)).

## **3.0.6** released on 22nd October 2018
Expand Down
6 changes: 3 additions & 3 deletions lib/parsers/code.js
View file
Expand Up @@ -44,15 +44,15 @@ class Code extends Parser.default {
}

// Remove e-mail addresses
re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
while (match = re.exec(text)) {
var replace = ' '.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
}

if (document.languageId === 'pascal') {
// Remove compiler directives in comments
re = /\{\$.+?\}/gm;
var re = /\{\$.+?\}/gm;
while (match = re.exec(text)) {
var replace = ' '.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
Expand All @@ -61,7 +61,7 @@ class Code extends Parser.default {

if (document.languageId === 'elixir') {
// Remove compiler directives in comments
re = /.*(iex|\.\.\.)>.*/gm;
var re = /.*(iex|\.\.\.)>.*/gm;
while (match = re.exec(text)) {
var replace = ' '.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
Expand Down
2 changes: 1 addition & 1 deletion lib/parsers/latex.js
View file
Expand Up @@ -125,7 +125,7 @@ class LaTeX extends Parser.default {
}

// Remove e-mail addresses
re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
while (match = re.exec(text)) {
var replace = ' '.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
Expand Down
14 changes: 7 additions & 7 deletions lib/parsers/markdown.js
View file
Expand Up @@ -30,14 +30,14 @@ class Markdown extends Parser.default {
}

// Remove links from inside []() construct
re = /(\[.*\])(\(.*\))/g;
var re = /(\[.*\])(\(.*\))/g;
while (match = re.exec(text)) {
var replace = '_'.repeat(match[2].length);
text = Parser.replaceAt(text, match.index + match[1].length, replace);
}

// Remove XML/HTML tags
re = /<[\w\/][^>]+>/g;
var re = /<[\w\/][^>]+>/g;
while (match = re.exec(text)) {
// Check whether not inside comment, if so, leave.
var ce = /<!--[^>]*-->/g;
Expand All @@ -60,15 +60,15 @@ class Markdown extends Parser.default {

if (document.languageId === 'asciidoc') {
// Attributes (:name: value) except some (e.g. :summary:)
re = /^:(\w[\w\d]*):.*$/gm;
var re = /^:(\w[\w\d]*):.*$/gm;
while (match = re.exec(text)) {
if (match[1] !== 'summary') {
var replace = '_'.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
}
}
// Options ([...])
re = /^\[.*\]$/gm;
var re = /^\[.*\]$/gm;
while (match = re.exec(text)) {
var replace = '_'.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
Expand All @@ -78,7 +78,7 @@ class Markdown extends Parser.default {
if (document.languageId === 'restructuredtext') {
// Remove reStructuredText directives relative to code blocks
// with this RegExp: https://regex101.com/r/GJXToz/2
re = /^\.\. (code-block|highlight).*($\s{4,}.*)*/gm;
var re = /^\.\. (code-block|highlight).*($\s{4,}.*)*/gm;
while (match = re.exec(text)) {
var replace = match[0].replace(/(?:[^\r\n]|\r(?!\n))/g, '_');
text = Parser.replaceAt(text, match.index, replace);
Expand All @@ -93,7 +93,7 @@ class Markdown extends Parser.default {
var match;

// Remove inline code sections
re = /`[^\n`]+`/g;
var re = /`[^\n`]+`/g;
while (match = re.exec(text)) {
var replace = '_'.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
Expand All @@ -107,7 +107,7 @@ class Markdown extends Parser.default {
}

// Remove e-mail addresses
re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
while (match = re.exec(text)) {
var replace = '_'.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
Expand Down
8 changes: 4 additions & 4 deletions lib/parsers/plaintext.js
View file
Expand Up @@ -26,7 +26,7 @@ class Plaintext extends Parser.default {
}

if (document.languageId === 'mediawiki') {
re = /(<([^>]+)>)/ig;
var re = /(<([^>]+)>)/ig;
while (match = re.exec(text)) {
var replace = ' '.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
Expand All @@ -48,21 +48,21 @@ class Plaintext extends Parser.default {
}

// Remove e-mail addresses
re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
while (match = re.exec(text)) {
var replace = ' '.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
}

if (document.languageId === 'git-commit' || document.languageId === 'git-rebase') {
// Remove tail part after `# ------------------------ >8 -...`
re = /\# -[-]+ >8 -[-][\s\S]*/gm;
var re = /\# -[-]+ >8 -[-][\s\S]*/gm;
while (match = re.exec(text)) {
var replace = ' '.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
}
// Remove line comments `# ...`
re = /#.*$/gm;
var re = /#.*$/gm;
while (match = re.exec(text)) {
var replace = ' '.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
Expand Down
2 changes: 1 addition & 1 deletion lib/parsers/xml.js
View file
Expand Up @@ -51,7 +51,7 @@ class Xml extends Parser.default {
}

// Remove e-mail addresses
re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
var re = /(mailto:)*(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))/g;
while (match = re.exec(text)) {
var replace = ' '.repeat(match[0].length);
text = Parser.replaceAt(text, match.index, replace);
Expand Down
4 changes: 2 additions & 2 deletions src/spellright.js
View file
Expand Up @@ -1099,8 +1099,8 @@ var SpellRight = (function () {
// Adjust diagnostics behind changed lines range BEFORE
if (shift != 0) {
if (_drange._end._line > range._end._line) {
_drange._start._line += shift;
_drange._end._line += shift;
diagnostics[i].range._start._line += shift;
diagnostics[i].range._end._line += shift;
}
}
}
Expand Down

0 comments on commit ded9cf9

Please sign in to comment.