mirror of
https://github.com/VSCodeVim/Vim.git
synced 2024-10-05 16:17:18 +03:00
upgraade packages. fix lint issues
This commit is contained in:
Jason Poon
parent
70b270c692
commit
347f5ef005
5822
package-lock.json
generated
Normal file
5822
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
26
package.json
26
package.json
@ -569,27 +569,27 @@
|
||||
"dependencies": {
|
||||
"clipboardy": "^1.1.4",
|
||||
"diff-match-patch": "^1.0.0",
|
||||
"lodash": "^4.12.0",
|
||||
"lodash": "^4.17.4",
|
||||
"neovim-client": "^2.1.0",
|
||||
"prettier": "^1.6.1",
|
||||
"prettier": "^1.7.4",
|
||||
"promised-neovim-client": "^2.0.2",
|
||||
"untildify": "^3.0.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/mocha": "^2.2.39",
|
||||
"@types/node": "^6.0.41",
|
||||
"@types/mocha": "^2.2.43",
|
||||
"@types/node": "^6.0.89",
|
||||
"gulp": "^3.9.1",
|
||||
"gulp-bump": "^2.1.0",
|
||||
"gulp-git": "^2.4.1",
|
||||
"gulp-bump": "^2.8.0",
|
||||
"gulp-git": "^2.4.2",
|
||||
"gulp-inject-string": "^1.1.0",
|
||||
"gulp-shell": "^0.5.2",
|
||||
"gulp-shell": "^0.6.3",
|
||||
"gulp-tag-version": "^1.3.0",
|
||||
"gulp-tslint": "^7.0.1",
|
||||
"gulp-typings": "^2.0.0",
|
||||
"merge-stream": "^1.0.0",
|
||||
"mocha": "^3.2.0",
|
||||
"tslint": "^4.3.1",
|
||||
"typescript": "^2.3.2",
|
||||
"gulp-tslint": "^8.1.2",
|
||||
"gulp-typings": "^2.0.4",
|
||||
"merge-stream": "^1.0.1",
|
||||
"mocha": "^4.0.1",
|
||||
"tslint": "^5.7.0",
|
||||
"typescript": "^2.5.3",
|
||||
"vscode": "^1.1.5"
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,208 +1,208 @@
|
||||
import { Position, PositionDiff } from './../motion/position';
|
||||
import { TextEditor } from './../../textEditor';
|
||||
import * as vscode from 'vscode';
|
||||
|
||||
function escapeRegExpCharacters(value: string): string {
|
||||
return value.replace(/[\-\\\{\}\*\+\?\|\^\$\.\,\[\]\(\)\#\s]/g, '\\$&');
|
||||
}
|
||||
|
||||
let toReversedString = (function() {
|
||||
function reverse(str: string): string {
|
||||
let reversedStr = '';
|
||||
for (let i = str.length - 1; i >= 0; i--) {
|
||||
reversedStr += str.charAt(i);
|
||||
}
|
||||
return reversedStr;
|
||||
}
|
||||
|
||||
let lastInput: string = '';
|
||||
let lastOutput: string = '';
|
||||
return function toReversedString(str: string): string {
|
||||
if (lastInput !== str) {
|
||||
lastInput = str;
|
||||
lastOutput = reverse(lastInput);
|
||||
}
|
||||
return lastOutput;
|
||||
};
|
||||
})();
|
||||
|
||||
/**
|
||||
* PairMatcher finds the position matching the given character, respecting nested
|
||||
* instances of the pair.
|
||||
*/
|
||||
export class PairMatcher {
|
||||
static pairings: {
|
||||
[key: string]: {
|
||||
match: string;
|
||||
nextMatchIsForward: boolean;
|
||||
directionLess?: boolean;
|
||||
matchesWithPercentageMotion?: boolean;
|
||||
};
|
||||
} = {
|
||||
'(': { match: ')', nextMatchIsForward: true, matchesWithPercentageMotion: true },
|
||||
'{': { match: '}', nextMatchIsForward: true, matchesWithPercentageMotion: true },
|
||||
'[': { match: ']', nextMatchIsForward: true, matchesWithPercentageMotion: true },
|
||||
')': { match: '(', nextMatchIsForward: false, matchesWithPercentageMotion: true },
|
||||
'}': { match: '{', nextMatchIsForward: false, matchesWithPercentageMotion: true },
|
||||
']': { match: '[', nextMatchIsForward: false, matchesWithPercentageMotion: true },
|
||||
// These characters can't be used for "%"-based matching, but are still
|
||||
// useful for text objects.
|
||||
'<': { match: '>', nextMatchIsForward: true },
|
||||
'>': { match: '<', nextMatchIsForward: false },
|
||||
// These are useful for deleting closing and opening quotes, but don't seem to negatively
|
||||
// affect how text objects such as `ci"` work, which was my worry.
|
||||
'"': { match: '"', nextMatchIsForward: false, directionLess: true },
|
||||
"'": { match: "'", nextMatchIsForward: false, directionLess: true },
|
||||
'`': { match: '`', nextMatchIsForward: false, directionLess: true },
|
||||
};
|
||||
|
||||
static nextPairedChar(
|
||||
position: Position,
|
||||
charToMatch: string,
|
||||
closed: boolean = true
|
||||
): Position | undefined {
|
||||
/**
|
||||
* We do a fairly basic implementation that only tracks the state of the type of
|
||||
* character you're over and its pair (e.g. "[" and "]"). This is similar to
|
||||
* what Vim does.
|
||||
*
|
||||
* It can't handle strings very well - something like "|( ')' )" where | is the
|
||||
* cursor will cause it to go to the ) in the quotes, even though it should skip over it.
|
||||
*
|
||||
* PRs welcomed! (TODO)
|
||||
* Though ideally VSC implements https://github.com/Microsoft/vscode/issues/7177
|
||||
*/
|
||||
const toFind = this.pairings[charToMatch];
|
||||
|
||||
if (toFind === undefined || toFind.directionLess) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let regex = new RegExp(
|
||||
'(' + escapeRegExpCharacters(charToMatch) + '|' + escapeRegExpCharacters(toFind.match) + ')',
|
||||
'i'
|
||||
);
|
||||
|
||||
let stackHeight = closed ? 0 : 1;
|
||||
let matchedPosition: Position | undefined = undefined;
|
||||
|
||||
// find matched bracket up
|
||||
if (!toFind.nextMatchIsForward) {
|
||||
for (let lineNumber = position.line; lineNumber >= 0; lineNumber--) {
|
||||
let lineText = TextEditor.getLineAt(new Position(lineNumber, 0)).text;
|
||||
let startOffset =
|
||||
lineNumber === position.line ? lineText.length - position.character - 1 : 0;
|
||||
|
||||
while (true) {
|
||||
let queryText = toReversedString(lineText).substr(startOffset);
|
||||
if (queryText === '') {
|
||||
break;
|
||||
}
|
||||
|
||||
let m = queryText.match(regex);
|
||||
|
||||
if (!m) {
|
||||
break;
|
||||
}
|
||||
|
||||
let matchedChar = m[0];
|
||||
if (matchedChar === charToMatch) {
|
||||
stackHeight++;
|
||||
}
|
||||
|
||||
if (matchedChar === toFind.match) {
|
||||
stackHeight--;
|
||||
}
|
||||
|
||||
if (stackHeight === 0) {
|
||||
matchedPosition = new Position(
|
||||
lineNumber,
|
||||
lineText.length - startOffset - m.index! - 1
|
||||
);
|
||||
return matchedPosition;
|
||||
}
|
||||
|
||||
startOffset = startOffset + m.index! + 1;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (
|
||||
let lineNumber = position.line, lineCount = TextEditor.getLineCount();
|
||||
lineNumber < lineCount;
|
||||
lineNumber++
|
||||
) {
|
||||
let lineText = TextEditor.getLineAt(new Position(lineNumber, 0)).text;
|
||||
let startOffset = lineNumber === position.line ? position.character : 0;
|
||||
|
||||
while (true) {
|
||||
let queryText = lineText.substr(startOffset);
|
||||
if (queryText === '') {
|
||||
break;
|
||||
}
|
||||
|
||||
let m = queryText.match(regex);
|
||||
|
||||
if (!m) {
|
||||
break;
|
||||
}
|
||||
|
||||
let matchedChar = m[0];
|
||||
if (matchedChar === charToMatch) {
|
||||
stackHeight++;
|
||||
}
|
||||
|
||||
if (matchedChar === toFind.match) {
|
||||
stackHeight--;
|
||||
}
|
||||
|
||||
if (stackHeight === 0) {
|
||||
matchedPosition = new Position(lineNumber, startOffset + m.index!);
|
||||
return matchedPosition;
|
||||
}
|
||||
|
||||
startOffset = startOffset + m.index! + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (matchedPosition) {
|
||||
return matchedPosition;
|
||||
}
|
||||
|
||||
// TODO(bell)
|
||||
return undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Given a current position, find an immediate following bracket and return the range. If
|
||||
* no matching bracket is found immediately following the opening bracket, return undefined.
|
||||
*/
|
||||
static immediateMatchingBracket(currentPosition: Position): vscode.Range | undefined {
|
||||
// Don't delete bracket unless autoClosingBrackets is set
|
||||
if (!vscode.workspace.getConfiguration().get('editor.autoClosingBrackets')) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const deleteRange = new vscode.Range(
|
||||
currentPosition,
|
||||
currentPosition.getLeftThroughLineBreaks()
|
||||
);
|
||||
const deleteText = vscode.window.activeTextEditor!.document.getText(deleteRange);
|
||||
let matchRange: vscode.Range | undefined;
|
||||
let isNextMatch = false;
|
||||
|
||||
if ('{[("\'`'.indexOf(deleteText) > -1) {
|
||||
const matchPosition = currentPosition.add(new PositionDiff(0, 1));
|
||||
matchRange = new vscode.Range(matchPosition, matchPosition.getLeftThroughLineBreaks());
|
||||
isNextMatch =
|
||||
vscode.window.activeTextEditor!.document.getText(matchRange) ===
|
||||
PairMatcher.pairings[deleteText].match;
|
||||
}
|
||||
|
||||
if (isNextMatch && matchRange) {
|
||||
return matchRange;
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
import { Position, PositionDiff } from './../motion/position';
|
||||
import { TextEditor } from './../../textEditor';
|
||||
import * as vscode from 'vscode';
|
||||
|
||||
function escapeRegExpCharacters(value: string): string {
|
||||
return value.replace(/[\-\\\{\}\*\+\?\|\^\$\.\,\[\]\(\)\#\s]/g, '\\$&');
|
||||
}
|
||||
|
||||
let toReversedString = (function() {
|
||||
function reverse(str: string): string {
|
||||
let reversedStr = '';
|
||||
for (let i = str.length - 1; i >= 0; i--) {
|
||||
reversedStr += str.charAt(i);
|
||||
}
|
||||
return reversedStr;
|
||||
}
|
||||
|
||||
let lastInput: string = '';
|
||||
let lastOutput: string = '';
|
||||
return function(str: string): string {
|
||||
if (lastInput !== str) {
|
||||
lastInput = str;
|
||||
lastOutput = reverse(lastInput);
|
||||
}
|
||||
return lastOutput;
|
||||
};
|
||||
})();
|
||||
|
||||
/**
|
||||
* PairMatcher finds the position matching the given character, respecting nested
|
||||
* instances of the pair.
|
||||
*/
|
||||
export class PairMatcher {
|
||||
static pairings: {
|
||||
[key: string]: {
|
||||
match: string;
|
||||
nextMatchIsForward: boolean;
|
||||
directionLess?: boolean;
|
||||
matchesWithPercentageMotion?: boolean;
|
||||
};
|
||||
} = {
|
||||
'(': { match: ')', nextMatchIsForward: true, matchesWithPercentageMotion: true },
|
||||
'{': { match: '}', nextMatchIsForward: true, matchesWithPercentageMotion: true },
|
||||
'[': { match: ']', nextMatchIsForward: true, matchesWithPercentageMotion: true },
|
||||
')': { match: '(', nextMatchIsForward: false, matchesWithPercentageMotion: true },
|
||||
'}': { match: '{', nextMatchIsForward: false, matchesWithPercentageMotion: true },
|
||||
']': { match: '[', nextMatchIsForward: false, matchesWithPercentageMotion: true },
|
||||
// These characters can't be used for "%"-based matching, but are still
|
||||
// useful for text objects.
|
||||
'<': { match: '>', nextMatchIsForward: true },
|
||||
'>': { match: '<', nextMatchIsForward: false },
|
||||
// These are useful for deleting closing and opening quotes, but don't seem to negatively
|
||||
// affect how text objects such as `ci"` work, which was my worry.
|
||||
'"': { match: '"', nextMatchIsForward: false, directionLess: true },
|
||||
"'": { match: "'", nextMatchIsForward: false, directionLess: true },
|
||||
'`': { match: '`', nextMatchIsForward: false, directionLess: true },
|
||||
};
|
||||
|
||||
static nextPairedChar(
|
||||
position: Position,
|
||||
charToMatch: string,
|
||||
closed: boolean = true
|
||||
): Position | undefined {
|
||||
/**
|
||||
* We do a fairly basic implementation that only tracks the state of the type of
|
||||
* character you're over and its pair (e.g. "[" and "]"). This is similar to
|
||||
* what Vim does.
|
||||
*
|
||||
* It can't handle strings very well - something like "|( ')' )" where | is the
|
||||
* cursor will cause it to go to the ) in the quotes, even though it should skip over it.
|
||||
*
|
||||
* PRs welcomed! (TODO)
|
||||
* Though ideally VSC implements https://github.com/Microsoft/vscode/issues/7177
|
||||
*/
|
||||
const toFind = this.pairings[charToMatch];
|
||||
|
||||
if (toFind === undefined || toFind.directionLess) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
let regex = new RegExp(
|
||||
'(' + escapeRegExpCharacters(charToMatch) + '|' + escapeRegExpCharacters(toFind.match) + ')',
|
||||
'i'
|
||||
);
|
||||
|
||||
let stackHeight = closed ? 0 : 1;
|
||||
let matchedPosition: Position | undefined = undefined;
|
||||
|
||||
// find matched bracket up
|
||||
if (!toFind.nextMatchIsForward) {
|
||||
for (let lineNumber = position.line; lineNumber >= 0; lineNumber--) {
|
||||
let lineText = TextEditor.getLineAt(new Position(lineNumber, 0)).text;
|
||||
let startOffset =
|
||||
lineNumber === position.line ? lineText.length - position.character - 1 : 0;
|
||||
|
||||
while (true) {
|
||||
let queryText = toReversedString(lineText).substr(startOffset);
|
||||
if (queryText === '') {
|
||||
break;
|
||||
}
|
||||
|
||||
let m = queryText.match(regex);
|
||||
|
||||
if (!m) {
|
||||
break;
|
||||
}
|
||||
|
||||
let matchedChar = m[0];
|
||||
if (matchedChar === charToMatch) {
|
||||
stackHeight++;
|
||||
}
|
||||
|
||||
if (matchedChar === toFind.match) {
|
||||
stackHeight--;
|
||||
}
|
||||
|
||||
if (stackHeight === 0) {
|
||||
matchedPosition = new Position(
|
||||
lineNumber,
|
||||
lineText.length - startOffset - m.index! - 1
|
||||
);
|
||||
return matchedPosition;
|
||||
}
|
||||
|
||||
startOffset = startOffset + m.index! + 1;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (
|
||||
let lineNumber = position.line, lineCount = TextEditor.getLineCount();
|
||||
lineNumber < lineCount;
|
||||
lineNumber++
|
||||
) {
|
||||
let lineText = TextEditor.getLineAt(new Position(lineNumber, 0)).text;
|
||||
let startOffset = lineNumber === position.line ? position.character : 0;
|
||||
|
||||
while (true) {
|
||||
let queryText = lineText.substr(startOffset);
|
||||
if (queryText === '') {
|
||||
break;
|
||||
}
|
||||
|
||||
let m = queryText.match(regex);
|
||||
|
||||
if (!m) {
|
||||
break;
|
||||
}
|
||||
|
||||
let matchedChar = m[0];
|
||||
if (matchedChar === charToMatch) {
|
||||
stackHeight++;
|
||||
}
|
||||
|
||||
if (matchedChar === toFind.match) {
|
||||
stackHeight--;
|
||||
}
|
||||
|
||||
if (stackHeight === 0) {
|
||||
matchedPosition = new Position(lineNumber, startOffset + m.index!);
|
||||
return matchedPosition;
|
||||
}
|
||||
|
||||
startOffset = startOffset + m.index! + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (matchedPosition) {
|
||||
return matchedPosition;
|
||||
}
|
||||
|
||||
// TODO(bell)
|
||||
return undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Given a current position, find an immediate following bracket and return the range. If
|
||||
* no matching bracket is found immediately following the opening bracket, return undefined.
|
||||
*/
|
||||
static immediateMatchingBracket(currentPosition: Position): vscode.Range | undefined {
|
||||
// Don't delete bracket unless autoClosingBrackets is set
|
||||
if (!vscode.workspace.getConfiguration().get('editor.autoClosingBrackets')) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const deleteRange = new vscode.Range(
|
||||
currentPosition,
|
||||
currentPosition.getLeftThroughLineBreaks()
|
||||
);
|
||||
const deleteText = vscode.window.activeTextEditor!.document.getText(deleteRange);
|
||||
let matchRange: vscode.Range | undefined;
|
||||
let isNextMatch = false;
|
||||
|
||||
if ('{[("\'`'.indexOf(deleteText) > -1) {
|
||||
const matchPosition = currentPosition.add(new PositionDiff(0, 1));
|
||||
matchRange = new vscode.Range(matchPosition, matchPosition.getLeftThroughLineBreaks());
|
||||
isNextMatch =
|
||||
vscode.window.activeTextEditor!.document.getText(matchRange) ===
|
||||
PairMatcher.pairings[deleteText].match;
|
||||
}
|
||||
|
||||
if (isNextMatch && matchRange) {
|
||||
return matchRange;
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"allowUnusedLabels": false,
|
||||
"module": "commonjs",
|
||||
"target": "es6",
|
||||
"outDir": "out",
|
||||
"noImplicitAny": true,
|
||||
"noImplicitReturns": true,
|
||||
"suppressImplicitAnyIndexErrors": true,
|
||||
"lib": [
|
||||
"es6"
|
||||
],
|
||||
"sourceMap": true,
|
||||
"strictNullChecks": true,
|
||||
"experimentalDecorators": true,
|
||||
"alwaysStrict": true
|
||||
},
|
||||
"exclude": [
|
||||
"node_modules",
|
||||
".vscode-test"
|
||||
]
|
||||
}
|
||||
{
|
||||
"compilerOptions": {
|
||||
"allowUnusedLabels": false,
|
||||
"module": "commonjs",
|
||||
"target": "es6",
|
||||
"outDir": "out",
|
||||
"noImplicitAny": true,
|
||||
"noImplicitReturns": true,
|
||||
"suppressImplicitAnyIndexErrors": true,
|
||||
"lib": [
|
||||
"es6"
|
||||
],
|
||||
"sourceMap": true,
|
||||
"strictNullChecks": true,
|
||||
"experimentalDecorators": true,
|
||||
"alwaysStrict": true
|
||||
},
|
||||
"exclude": [
|
||||
"node_modules",
|
||||
".vscode-test"
|
||||
]
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user