Skip to content

V
vscode

掘金者说 / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 4de419d2 编写于 作者: A Alex Dima
浏览文件
操作

Adopt new editor.wordSeparators for word mouse navigation

上级 678700ea
隐藏空白更改
内联 并排
Showing with 212 addition and 89 deletion
src/vs/editor/common/controller/oneCursor.ts
浏览文件 @ 4de419d2
......@@ -74,6 +74,10 @@ export interface IOneCursorState {
selectionStartLeftoverVisibleColumns: number;
}
export interface IFindWordResult extends editorCommon.IWordRange {
wordType: WordType;
}
export class OneCursor {
// --- contextual state
......@@ -445,13 +449,13 @@ export class OneCursor {
public getLineContent(lineNumber:number): string {
return this.model.getLineContent(lineNumber);
}
public findWord(position:editorCommon.IEditorPosition, preference:string, skipSyntaxTokens?:boolean): editorCommon.IWordRange {
return this.helper.findWord(position, preference, skipSyntaxTokens);
}
public findPreviousWordOnLine(position:editorCommon.IEditorPosition): editorCommon.IWordRange {
// public findWord(position:editorCommon.IEditorPosition, preference:string, skipSyntaxTokens?:boolean): editorCommon.IWordRange {
// return this.helper.findWord(position, preference, skipSyntaxTokens);
// }
public findPreviousWordOnLine(position:editorCommon.IEditorPosition): IFindWordResult {
return this.helper.findPreviousWordOnLine(position);
}
public findNextWordOnLine(position:editorCommon.IEditorPosition): editorCommon.IWordRange {
public findNextWordOnLine(position:editorCommon.IEditorPosition): IFindWordResult {
return this.helper.findNextWordOnLine(position);
}
public getLeftOfPosition(lineNumber:number, column:number): editorCommon.IPosition {
......@@ -879,47 +883,73 @@ export class OneCursorOp {
public static word(cursor:OneCursor, inSelectionMode: boolean, position: editorCommon.IPosition, preference: string, ctx: IOneCursorOperationContext): boolean {
// TODO@Alex -> select in editable range
var validatedPosition = cursor.validatePosition(position);
var word = cursor.findWord(validatedPosition, preference);
var wordStartColumn:number, wordEndColumn:number;
var lineNumber:number, column:number;
let validatedPosition = cursor.validatePosition(position);
let prevWord = cursor.findPreviousWordOnLine(validatedPosition);
let isInPrevWord = (prevWord && prevWord.wordType === WordType.Regular && prevWord.start < validatedPosition.column - 1 && validatedPosition.column - 1 <= prevWord.end);
let nextWord = cursor.findNextWordOnLine(validatedPosition);
let isInNextWord = (nextWord && nextWord.wordType === WordType.Regular && nextWord.start < validatedPosition.column - 1 && validatedPosition.column - 1 <= nextWord.end);
let lineNumber: number;
let column: number;
if (!inSelectionMode || !cursor.hasSelection()) {
if (word) {
wordStartColumn = word.start + 1;
wordEndColumn = word.end + 1;
let startColumn: number;
let endColumn: number;
if (isInPrevWord) {
startColumn = prevWord.start + 1;
endColumn = prevWord.end + 1;
} else if (isInNextWord) {
startColumn = nextWord.start + 1;
endColumn = nextWord.end + 1;
} else {
var maxColumn = cursor.model.getLineMaxColumn(validatedPosition.lineNumber);
if (validatedPosition.column === maxColumn || preference === 'left') {
wordStartColumn = validatedPosition.column - 1;
wordEndColumn = validatedPosition.column;
if (prevWord) {
startColumn = prevWord.end + 1;
} else {
wordStartColumn = validatedPosition.column;
wordEndColumn = validatedPosition.column + 1;
}
if (wordStartColumn <= 1) {
wordStartColumn = 1;
startColumn = 1;
}
if (wordEndColumn >= maxColumn) {
wordEndColumn = maxColumn;
if (nextWord) {
endColumn = nextWord.start + 1;
} else {
endColumn = cursor.model.getLineMaxColumn(validatedPosition.lineNumber);
}
}
var selectionStartRange = new Range(validatedPosition.lineNumber, wordStartColumn, validatedPosition.lineNumber, wordEndColumn);
var r1 = cursor.convertModelPositionToViewPosition(validatedPosition.lineNumber, wordStartColumn);
var r2 = cursor.convertModelPositionToViewPosition(validatedPosition.lineNumber, wordEndColumn);
let selectionStartRange = new Range(validatedPosition.lineNumber, startColumn, validatedPosition.lineNumber, endColumn);
let r1 = cursor.convertModelPositionToViewPosition(validatedPosition.lineNumber, startColumn);
let r2 = cursor.convertModelPositionToViewPosition(validatedPosition.lineNumber, endColumn);
cursor.setSelectionStart(selectionStartRange, new Range(r1.lineNumber, r1.column, r2.lineNumber, r2.column));
lineNumber = selectionStartRange.endLineNumber;
column = selectionStartRange.endColumn;
} else {
wordStartColumn = word ? word.start + 1 : validatedPosition.column;
wordEndColumn = word ? word.end + 1 : validatedPosition.column;
let startColumn: number;
let endColumn: number;
if (isInPrevWord) {
startColumn = prevWord.start + 1;
endColumn = prevWord.end + 1;
} else if (isInNextWord) {
startColumn = nextWord.start + 1;
endColumn = nextWord.end + 1;
} else {
startColumn = validatedPosition.column;
endColumn = validatedPosition.column;
}
lineNumber = validatedPosition.lineNumber;
if (validatedPosition.isBeforeOrEqual(cursor.getSelectionStart().getStartPosition())) {
column = wordStartColumn;
column = startColumn;
let possiblePosition = new Position(lineNumber, column);
if (cursor.getSelectionStart().containsPosition(possiblePosition)) {
column = cursor.getSelectionStart().endColumn;
}
} else {
column = wordEndColumn;
column = endColumn;
let possiblePosition = new Position(lineNumber, column);
if (cursor.getSelectionStart().containsPosition(possiblePosition)) {
column = cursor.getSelectionStart().startColumn;
}
}
}
......@@ -1761,51 +1791,56 @@ class CursorHelper {
return CursorMoveHelper.prevTabColumn(column, this.configuration.getIndentationOptions().tabSize);
}
public findWord(position:editorCommon.IEditorPosition, preference:string, skipSyntaxTokens:boolean=false): editorCommon.IWordRange {
var words = this.model.getWords(position.lineNumber);
var searchIndex:number, i:number, len:number;
if (skipSyntaxTokens) {
searchIndex = position.column - 1;
if (preference === 'left') {
for (i = words.length - 1; i >= 0; i--) {
if (words[i].start >= searchIndex) {
continue;
}
return words[i];
}
} else {
for (i = 0, len = words.length; i < len; i++) {
if (words[i].end <= searchIndex) {
continue;
}
return words[i];
}
}
} else {
searchIndex = position.column;
if (preference === 'left') {
if (searchIndex !== 1) {
searchIndex = searchIndex - 0.1;
}
} else {
if (searchIndex !== this.model.getLineMaxColumn(position.lineNumber)) {
searchIndex = searchIndex + 0.1;
}
}
searchIndex = searchIndex - 1;
for (i = 0, len = words.length; i < len; i++) {
if (words[i].start <= searchIndex && searchIndex <= words[i].end) {
return words[i];
}
}
}
return null;
}
public findPreviousWordOnLine(_position:editorCommon.IEditorPosition): editorCommon.IWordRange {
// public findWord(position:editorCommon.IEditorPosition, preference:string, skipSyntaxTokens:boolean=false): editorCommon.IWordRange {
// var words = this.model.getWords(position.lineNumber);
// var searchIndex:number, i:number, len:number;
// if (skipSyntaxTokens) {
// searchIndex = position.column - 1;
// if (preference === 'left') {
// for (i = words.length - 1; i >= 0; i--) {
// if (words[i].start >= searchIndex) {
// continue;
// }
// return words[i];
// }
// } else {
// for (i = 0, len = words.length; i < len; i++) {
// if (words[i].end <= searchIndex) {
// continue;
// }
// return words[i];
// }
// }
// } else {
// searchIndex = position.column;
// if (preference === 'left') {
// if (searchIndex !== 1) {
// searchIndex = searchIndex - 0.1;
// }
// } else {
// if (searchIndex !== this.model.getLineMaxColumn(position.lineNumber)) {
// searchIndex = searchIndex + 0.1;
// }
// }
// searchIndex = searchIndex - 1;
// for (i = 0, len = words.length; i < len; i++) {
// if (words[i].start <= searchIndex && searchIndex <= words[i].end) {
// return words[i];
// }
// }
// }
// return null;
// }
private _createWord(lineContent: string, wordType:WordType, start: number, end: number): IFindWordResult {
// console.log('WORD ==> ' + start + ' => ' + end + ':::: <<<' + lineContent.substring(start, end) + '>>>');
return { start: start, end: end, wordType: wordType };
}
public findPreviousWordOnLine(_position:editorCommon.IEditorPosition): IFindWordResult {
let position = this.model.validatePosition(_position);
let wordSeparators = getMapForWordSeparators(this.configuration.editor.wordSeparators);
let lineContent = this.model.getLineContent(position.lineNumber);
......@@ -1816,20 +1851,25 @@ class CursorHelper {
if (chClass === CH_REGULAR) {
if (wordType === W_SEPARATOR) {
return { start: chIndex + 1, end: this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1) };
return this._createWord(lineContent, wordType, chIndex + 1, this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1));
}
wordType = W_REGULAR;
} else if (chClass === CH_WORD_SEPARATOR) {
if (wordType === W_REGULAR) {
return { start: chIndex + 1, end: this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1) };
return this._createWord(lineContent, wordType, chIndex + 1, this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1));
}
wordType = W_SEPARATOR;
} else if (chClass === CH_WHITESPACE) {
if (wordType !== W_NONE) {
return { start: chIndex + 1, end: this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1) };
return this._createWord(lineContent, wordType, chIndex + 1, this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1));
}
}
}
if (wordType !== W_NONE) {
return this._createWord(lineContent, wordType, 0, this._findEndOfWord(lineContent, wordSeparators, wordType, 0));
}
return null;
}
......@@ -1852,32 +1892,38 @@ class CursorHelper {
return len;
}
public findNextWordOnLine(_position:editorCommon.IEditorPosition): editorCommon.IWordRange {
public findNextWordOnLine(_position:editorCommon.IEditorPosition): IFindWordResult {
let position = this.model.validatePosition(_position);
let wordSeparators = getMapForWordSeparators(this.configuration.editor.wordSeparators);
let lineContent = this.model.getLineContent(position.lineNumber);
let wordType = W_NONE;
let len = lineContent.length;
for (let chIndex = position.column - 1, len = lineContent.length; chIndex < len; chIndex++) {
for (let chIndex = position.column - 1; chIndex < len; chIndex++) {
let chCode = lineContent.charCodeAt(chIndex);
let chClass:CharacterClass = (wordSeparators[chCode] || CharacterClass.Regular);
if (chClass === CH_REGULAR) {
if (wordType === W_SEPARATOR) {
return { start: this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), end: chIndex };
return this._createWord(lineContent, wordType, this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), chIndex);
}
wordType = W_REGULAR;
} else if (chClass === CH_WORD_SEPARATOR) {
if (wordType === W_REGULAR) {
return { start: this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), end: chIndex };
return this._createWord(lineContent, wordType, this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), chIndex);
}
wordType = W_SEPARATOR;
} else if (chClass === CH_WHITESPACE) {
if (wordType !== W_NONE) {
return { start: this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), end: chIndex };
return this._createWord(lineContent, wordType, this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), chIndex);
}
}
}
if (wordType !== W_NONE) {
return this._createWord(lineContent, wordType, this._findStartOfWord(lineContent, wordSeparators, wordType, len - 1), len);
}
return null;
}
......@@ -1887,20 +1933,20 @@ class CursorHelper {
let chClass:CharacterClass = (wordSeparators[chCode] || CharacterClass.Regular);
if (chClass === CH_WHITESPACE) {
return chIndex;
return chIndex + 1;
}
if (wordType === W_REGULAR && chClass === CH_WORD_SEPARATOR) {
return chIndex;
return chIndex + 1;
}
if (wordType === W_SEPARATOR && chClass === CH_REGULAR) {
return chIndex;
return chIndex + 1;
}
}
return -1;
return 0;
}
}
enum WordType {
export enum WordType {
None = 0,
Regular = 1,
Separator = 2
......
src/vs/editor/test/common/controller/cursor.test.ts
浏览文件 @ 4de419d2
......@@ -1195,6 +1195,83 @@ suite('Editor Controller - Regression tests', () => {
});
});
test('issue #832: word right', () => {
usingCursor({
text: [
' /* Just some more text a+= 3 +5-3 + 7 */ '
],
mode: null,
config: null
}, (model, cursor) => {
moveTo(cursor, 1, 1, false);
function assertWordRight(col, expectedCol) {
cursorCommand(cursor, col === 1 ? H.WordSelect : H.WordSelectDrag, {
position: {
lineNumber: 1,
column: col
},
preference: 'right'
});
assert.equal(cursor.getSelection().startColumn, 1, 'TEST FOR ' + col);
assert.equal(cursor.getSelection().endColumn, expectedCol, 'TEST FOR ' + col);
}
assertWordRight( 1, ' '.length + 1);
assertWordRight( 2, ' '.length + 1);
assertWordRight( 3, ' '.length + 1);
assertWordRight( 4, ' '.length + 1);
assertWordRight( 5, ' /'.length + 1);
assertWordRight( 6, ' /*'.length + 1);
assertWordRight( 7, ' /* '.length + 1);
assertWordRight( 8, ' /* Just'.length + 1);
assertWordRight( 9, ' /* Just'.length + 1);
assertWordRight(10, ' /* Just'.length + 1);
assertWordRight(11, ' /* Just'.length + 1);
assertWordRight(12, ' /* Just '.length + 1);
assertWordRight(13, ' /* Just some'.length + 1);
assertWordRight(14, ' /* Just some'.length + 1);
assertWordRight(15, ' /* Just some'.length + 1);
assertWordRight(16, ' /* Just some'.length + 1);
assertWordRight(17, ' /* Just some '.length + 1);
assertWordRight(18, ' /* Just some '.length + 1);
assertWordRight(19, ' /* Just some '.length + 1);
assertWordRight(20, ' /* Just some more'.length + 1);
assertWordRight(21, ' /* Just some more'.length + 1);
assertWordRight(22, ' /* Just some more'.length + 1);
assertWordRight(23, ' /* Just some more'.length + 1);
assertWordRight(24, ' /* Just some more '.length + 1);
assertWordRight(25, ' /* Just some more '.length + 1);
assertWordRight(26, ' /* Just some more '.length + 1);
assertWordRight(27, ' /* Just some more text'.length + 1);
assertWordRight(28, ' /* Just some more text'.length + 1);
assertWordRight(29, ' /* Just some more text'.length + 1);
assertWordRight(30, ' /* Just some more text'.length + 1);
assertWordRight(31, ' /* Just some more text '.length + 1);
assertWordRight(32, ' /* Just some more text a'.length + 1);
assertWordRight(33, ' /* Just some more text a+'.length + 1);
assertWordRight(34, ' /* Just some more text a+='.length + 1);
assertWordRight(35, ' /* Just some more text a+= '.length + 1);
assertWordRight(36, ' /* Just some more text a+= 3'.length + 1);
assertWordRight(37, ' /* Just some more text a+= 3 '.length + 1);
assertWordRight(38, ' /* Just some more text a+= 3 +'.length + 1);
assertWordRight(39, ' /* Just some more text a+= 3 +5'.length + 1);
assertWordRight(40, ' /* Just some more text a+= 3 +5-'.length + 1);
assertWordRight(41, ' /* Just some more text a+= 3 +5-3'.length + 1);
assertWordRight(42, ' /* Just some more text a+= 3 +5-3 '.length + 1);
assertWordRight(43, ' /* Just some more text a+= 3 +5-3 +'.length + 1);
assertWordRight(44, ' /* Just some more text a+= 3 +5-3 + '.length + 1);
assertWordRight(45, ' /* Just some more text a+= 3 +5-3 + 7'.length + 1);
assertWordRight(46, ' /* Just some more text a+= 3 +5-3 + 7 '.length + 1);
assertWordRight(47, ' /* Just some more text a+= 3 +5-3 + 7 *'.length + 1);
assertWordRight(48, ' /* Just some more text a+= 3 +5-3 + 7 */'.length + 1);
assertWordRight(49, ' /* Just some more text a+= 3 +5-3 + 7 */ '.length + 1);
assertWordRight(50, ' /* Just some more text a+= 3 +5-3 + 7 */ '.length + 1);
});
});
});
suite('Editor Controller - Cursor Configuration', () => {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或