Skip to content

Commit 554fc55

Browse files
authored
Consider line comments when determining indentation (microsoft#250591)
1 parent 30625ad commit 554fc55

File tree

1 file changed

+0
-29
lines changed

1 file changed

+0
-29
lines changed

src/vs/editor/contrib/indentation/browser/indentation.ts

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -435,18 +435,6 @@ export class AutoIndentOnPaste implements IEditorContribution {
435435

436436
let startLineNumber = range.startLineNumber;
437437

438-
while (startLineNumber <= range.endLineNumber) {
439-
if (this.shouldIgnoreLine(model, startLineNumber)) {
440-
startLineNumber++;
441-
continue;
442-
}
443-
break;
444-
}
445-
446-
if (startLineNumber > range.endLineNumber) {
447-
return;
448-
}
449-
450438
let firstLineText = model.getLineContent(startLineNumber);
451439
if (!/\S/.test(firstLineText.substring(0, range.startColumn - 1))) {
452440
const indentOfFirstLine = getGoodIndentForLine(autoIndent, model, model.getLanguageId(), startLineNumber, indentConverter, this._languageConfigurationService);
@@ -571,23 +559,6 @@ export class AutoIndentOnPaste implements IEditorContribution {
571559
return containsOnlyWhitespace;
572560
}
573561

574-
private shouldIgnoreLine(model: ITextModel, lineNumber: number): boolean {
575-
model.tokenization.forceTokenization(lineNumber);
576-
const nonWhitespaceColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
577-
if (nonWhitespaceColumn === 0) {
578-
return true;
579-
}
580-
const tokens = model.tokenization.getLineTokens(lineNumber);
581-
if (tokens.getCount() > 0) {
582-
const firstNonWhitespaceTokenIndex = tokens.findTokenIndexAtOffset(nonWhitespaceColumn);
583-
if (firstNonWhitespaceTokenIndex >= 0 && tokens.getStandardTokenType(firstNonWhitespaceTokenIndex) === StandardTokenType.Comment) {
584-
return true;
585-
}
586-
}
587-
588-
return false;
589-
}
590-
591562
public dispose(): void {
592563
this.callOnDispose.dispose();
593564
this.callOnModel.dispose();

0 commit comments

Comments
 (0)