提交 74156700 编写于 作者: F fetiew

Fixed formatting issues

上级 c9fde201
......@@ -323,25 +323,25 @@ export function lastNonWhitespaceIndex(str: string, startIndex: number = str.len
return -1;
}
export function lastWordPartEnd(str: string, startIndex: number = str.length-1): number{
export function lastWordPartEnd(str: string, startIndex: number = str.length - 1): number {
for (let i = startIndex; i >= 0; i--) {
let chCode = str.charCodeAt(i);
if (chCode === CharCode.Space || chCode === CharCode.Tab || isUpperAsciiLetter(chCode) || chCode === CharCode.Underline) {
return i-1;
return i - 1;
}
}
return -1;
}
export function nextWordPartBegin(str: string, startIndex: number = str.length-1): number{
const checkLowerCase = str.charCodeAt(startIndex-1) === CharCode.Space; // does a lc char count as a part start?
for (let i = startIndex; i < str.length; ++i){
export function nextWordPartBegin(str: string, startIndex: number = str.length - 1): number {
const checkLowerCase = str.charCodeAt(startIndex - 1) === CharCode.Space; // does a lc char count as a part start?
for (let i = startIndex; i < str.length; ++i) {
let chCode = str.charCodeAt(i);
if (chCode === CharCode.Space || chCode === CharCode.Tab || isUpperAsciiLetter(chCode) || (checkLowerCase && isLowerAsciiLetter(chCode))) {
return i+1;
return i + 1;
}
if (chCode === CharCode.Underline){
return i+2;
if (chCode === CharCode.Underline) {
return i + 2;
}
}
return -1;
......
......@@ -483,11 +483,11 @@ export class WordPartOperations extends WordOperations {
const lastWordPartEnd = strings.lastWordPartEnd(lineContent, startIndex);
const wordRange = WordOperations.deleteWordLeft(wordSeparators, model, selection, whitespaceHeuristics, wordNavigationType);
if (lastWordPartEnd === -1 || (wordRange.startColumn > lastWordPartEnd && wordRange.startColumn < column)){
if (lastWordPartEnd === -1 || (wordRange.startColumn > lastWordPartEnd && wordRange.startColumn < column)) {
return wordRange;
}
else {
const range = new Range(lineNumber, column, lineNumber, lastWordPartEnd+2);
const range = new Range(lineNumber, column, lineNumber, lastWordPartEnd + 2);
return range;
}
......@@ -522,7 +522,7 @@ export class WordPartOperations extends WordOperations {
const nextWordPartBegin = strings.nextWordPartBegin(lineContent, startIndex);
const wordRange = WordOperations.deleteWordRight(wordSeparators, model, selection, whitespaceHeuristics, wordNavigationType);
if (nextWordPartBegin === -1 || (wordRange && wordRange.endColumn < nextWordPartBegin && wordRange.endColumn >= column)){
if (nextWordPartBegin === -1 || (wordRange && wordRange.endColumn < nextWordPartBegin && wordRange.endColumn >= column)) {
return wordRange;
}
else {
......@@ -539,16 +539,16 @@ export class WordPartOperations extends WordOperations {
if (column === 1) {
if (lineNumber > 1) {
return new Position(lineNumber - 1, model.getLineMaxColumn(lineNumber-1));
return new Position(lineNumber - 1, model.getLineMaxColumn(lineNumber - 1));
}
return null;
}
if (wordPartCol === -1 || (wordPos.column > wordPartCol && wordPos.column < column && wordPos.lineNumber === lineNumber)){
if (wordPartCol === -1 || (wordPos.column > wordPartCol && wordPos.column < column && wordPos.lineNumber === lineNumber)) {
return wordPos;
}
else{
return new Position(lineNumber, wordPartCol+2);
else {
return new Position(lineNumber, wordPartCol + 2);
}
}
......@@ -569,7 +569,7 @@ export class WordPartOperations extends WordOperations {
}
if (wordPartCol === -1 || (wordPos.column < wordPartCol && wordPos.column > column && wordPos.lineNumber === lineNumber)){
if (wordPartCol === -1 || (wordPos.column < wordPartCol && wordPos.column > column && wordPos.lineNumber === lineNumber)) {
return wordPos;
}
else {
......
......@@ -23,16 +23,16 @@ suite('WordPartOperations', () => {
function runEditorCommand(editor: ICodeEditor, command: EditorCommand): void {
command.runEditorCommand(null, editor, null);
}
function moveWordPartLeft(editor: ICodeEditor, inSelectionmode: boolean = false): void{
function moveWordPartLeft(editor: ICodeEditor, inSelectionmode: boolean = false): void {
runEditorCommand(editor, inSelectionmode ? _cursorWordPartLeft : _cursorWordPartLeft);
}
function moveWordPartRight(editor: ICodeEditor, inSelectionmode: boolean = false): void{
function moveWordPartRight(editor: ICodeEditor, inSelectionmode: boolean = false): void {
runEditorCommand(editor, inSelectionmode ? _cursorWordPartLeft : _cursorWordPartRight);
}
function deleteWordPartLeft(editor: ICodeEditor): void{
function deleteWordPartLeft(editor: ICodeEditor): void {
runEditorCommand(editor, _deleteWordPartLeft);
}
function deleteWordPartRight(editor: ICodeEditor): void{
function deleteWordPartRight(editor: ICodeEditor): void {
runEditorCommand(editor, _deleteWordPartRight);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册