maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update blockCommentCommand

Browse source
This commit is contained in:
Koshi Eguchi 2021-10-21 15:59:48 +09:00
parent e8f55fba4d
commit 7c2cdc60f0
2 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/vs/editor/contrib/comment/blockCommentCommand.ts
View file

@ -62,7 +62,9 @@ export class BlockCommentCommand implements ICommand {
const endColumn = selection.endColumn;
const startLineText = model.getLineContent(startLineNumber);
const startLineMinColumn = startLineText.search(/[\S]/) + 1;
const endLineText = model.getLineContent(endLineNumber);
const endLineTextLength = endLineText.length + 1;
let startTokenIndex = startLineText.lastIndexOf(startToken, startColumn - 1 + startToken.length);
let endTokenIndex = endLineText.indexOf(endToken, endColumn - 1 - endToken.length);
@ -107,7 +109,7 @@ export class BlockCommentCommand implements ICommand {
new Range(startLineNumber, startTokenIndex + startToken.length + 1, endLineNumber, endTokenIndex + 1), startToken, endToken
);
} else {
ops = BlockCommentCommand._createAddBlockCommentOperations(selection, startToken, endToken, this._insertSpace);
ops = BlockCommentCommand._createAddBlockCommentOperations(selection, startToken, endToken, this._insertSpace, startLineMinColumn, endLineTextLength, model);
this._usedEndToken = ops.length === 1 ? endToken : null;
}
@ -142,21 +144,40 @@ export class BlockCommentCommand implements ICommand {
return res;
}
public static _createAddBlockCommentOperations(r: Range, startToken: string, endToken: string, insertSpace: boolean): IIdentifiedSingleEditOperation[] {
public static _createAddBlockCommentOperations(r: Range, startToken: string, endToken: string, insertSpace: boolean, startLineMinColumn: number, endLineTextLength: number, model: ITextModel): IIdentifiedSingleEditOperation[] {
let res: IIdentifiedSingleEditOperation[] = [];
if (!Range.isEmpty(r)) {
// Insert block comment start
res.push(EditOperation.insert(new Position(r.startLineNumber, r.startColumn), startToken + (insertSpace ? ' ' : '')));
res.push(EditOperation.insert(new Position(r.startLineNumber, startLineMinColumn), startToken + (insertSpace ? ' ' : '')));
// Insert block comment end
res.push(EditOperation.insert(new Position(r.endLineNumber, r.endColumn), (insertSpace ? ' ' : '') + endToken));
res.push(EditOperation.insert(new Position(r.endLineNumber, endLineTextLength), (insertSpace ? ' ' : '') + endToken));
} else {
// Insert both continuously
res.push(EditOperation.replace(new Range(
r.startLineNumber, r.startColumn,
r.endLineNumber, r.endColumn
), startToken + ' ' + endToken));
const startLineText = model.getLineContent(r.startLineNumber);
const startblockColumn = startLineText.search(/[{]/) + 2;
const cursorPosition = new Position(r.startLineNumber, startblockColumn);
const matchedBrackets = model.matchBracket(cursorPosition);
if (matchedBrackets) {
let newStartBracketPosition: Position;
let newEndBracketPosition: Position;
if (matchedBrackets[0].containsPosition(cursorPosition)) {
newStartBracketPosition = matchedBrackets[0].getStartPosition();
newEndBracketPosition = matchedBrackets[1].getStartPosition();
} else {
newStartBracketPosition = matchedBrackets[1].getStartPosition();
newEndBracketPosition = matchedBrackets[0].getStartPosition();
}
res.push(EditOperation.insert(new Position(newStartBracketPosition.lineNumber, startLineMinColumn), startToken + (insertSpace ? ' ' : '')));
res.push(EditOperation.insert(new Position(newEndBracketPosition.lineNumber, newEndBracketPosition.column + 1), (insertSpace ? ' ' : '') + endToken));
} else {
// Insert both continuously
res.push(EditOperation.replace(new Range(
r.startLineNumber, r.startColumn,
r.endLineNumber, r.endColumn
), startToken + ' ' + endToken));
}
}
return res;

10
src/vs/editor/contrib/comment/lineCommentCommand.ts
View file

@ -305,14 +305,20 @@ export class LineCommentCommand implements ICommand {
new Range(s.startLineNumber, firstNonWhitespaceIndex + 1, s.startLineNumber, lineContent.length + 1),
startToken,
endToken,
this._insertSpace
this._insertSpace,
s.startColumn,
s.endColumn,
model
);
} else {
ops = BlockCommentCommand._createAddBlockCommentOperations(
new Range(s.startLineNumber, model.getLineFirstNonWhitespaceColumn(s.startLineNumber), s.endLineNumber, model.getLineMaxColumn(s.endLineNumber)),
startToken,
endToken,
this._insertSpace
this._insertSpace,
s.startColumn,
s.endColumn,
model
);
}