Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for invalid Range parameters when trimming nb newlines #206375

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Check for invalid Range parameters when trimming nb newlines #206375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/vs/workbench/contrib/notebook/browser/contrib/saveParticipants/saveParticipants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,11 @@ class TrimFinalNewLinesParticipant implements IStoredFileWorkingCopySaveParticip
const textBuffer = cell.textBuffer;
const lastNonEmptyLine = this.findLastNonEmptyLine(textBuffer);
const deleteFromLineNumber = Math.max(lastNonEmptyLine + 1, cannotTouchLineNumber + 1);
const deletionRange = new Range(deleteFromLineNumber, 1, textBuffer.getLineCount(), textBuffer.getLineLastNonWhitespaceColumn(textBuffer.getLineCount()));
if (deleteFromLineNumber > textBuffer.getLineCount()) {
return;
}

const deletionRange = new Range(deleteFromLineNumber, 1, textBuffer.getLineCount(), textBuffer.getLineLastNonWhitespaceColumn(textBuffer.getLineCount()));
if (deletionRange.isEmpty()) {
return;
}
Expand All @@ -244,7 +247,7 @@ class TrimFinalNewLinesParticipant implements IStoredFileWorkingCopySaveParticip
}
}

class FinalNewLineParticipant implements IStoredFileWorkingCopySaveParticipant {
class InsertFinalNewLineParticipant implements IStoredFileWorkingCopySaveParticipant {

constructor(
@IConfigurationService private readonly configurationService: IConfigurationService,
Expand Down Expand Up @@ -520,7 +523,7 @@ export class SaveParticipantsContribution extends Disposable implements IWorkben
this._register(this.workingCopyFileService.addSaveParticipant(this.instantiationService.createInstance(TrimWhitespaceParticipant)));
this._register(this.workingCopyFileService.addSaveParticipant(this.instantiationService.createInstance(CodeActionOnSaveParticipant)));
this._register(this.workingCopyFileService.addSaveParticipant(this.instantiationService.createInstance(FormatOnSaveParticipant)));
this._register(this.workingCopyFileService.addSaveParticipant(this.instantiationService.createInstance(FinalNewLineParticipant)));
this._register(this.workingCopyFileService.addSaveParticipant(this.instantiationService.createInstance(InsertFinalNewLineParticipant)));
this._register(this.workingCopyFileService.addSaveParticipant(this.instantiationService.createInstance(TrimFinalNewLinesParticipant)));
}
}
Expand Down
Loading