Merge VS Code 1.31.1 (#4283)

This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions

View File

@@ -270,8 +270,8 @@ class LinkDetector implements editorCommon.IEditorContribution {
let newDecorations: IModelDeltaDecoration[] = [];
if (links) {
// Not sure why this is sometimes null
for (let i = 0; i < links.length; i++) {
newDecorations.push(LinkOccurrence.decoration(links[i], useMetaKey));
for (const link of links) {
newDecorations.push(LinkOccurrence.decoration(link, useMetaKey));
}
}
@@ -361,8 +361,7 @@ class LinkDetector implements editorCommon.IEditorContribution {
endColumn: position.column
}, 0, true);
for (let i = 0; i < decorations.length; i++) {
const decoration = decorations[i];
for (const decoration of decorations) {
const currentOccurrence = this.currentOccurrences[decoration.id];
if (currentOccurrence) {
return currentOccurrence;