Skip to content

Fix - context help identation #60

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

Closed
wants to merge 1 commit into from
Closed

Fix - context help identation #60

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
20 changes: 8 additions & 12 deletions src/ccs/commands/contextHelp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

type ContextExpressionInfo = {
text: string;
replacementEnd?: vscode.Position;
replacementRange?: vscode.Range;
};

function getContextExpressionInfo(document: vscode.TextDocument, selection: vscode.Selection): ContextExpressionInfo {
Expand All @@ -88,19 +88,16 @@
};
}

const startLine = selection.start.line;
const start = document.lineAt(startLine).range.start;
let replacementRange = new vscode.Range(selection.start, selection.end);

let lastLine = selection.end.line;
if (selection.end.character === 0 && selection.end.line > selection.start.line) {
lastLine = selection.end.line - 1;
const adjustedEnd = document.lineAt(selection.end.line - 1).range.end;
replacementRange = new vscode.Range(selection.start, adjustedEnd);
}

const end = document.lineAt(lastLine).range.end;

return {
text: document.getText(new vscode.Range(start, end)),
replacementEnd: end,
text: document.getText(replacementRange),
replacementRange,
};
}

Expand Down Expand Up @@ -164,9 +161,8 @@
const fallbackLine = document.lineAt(selection.active.line);
rangeToReplace = fallbackLine.range;
} else {
const start = document.lineAt(selection.start.line).range.start;
const replacementEnd = contextInfo.replacementEnd ?? document.lineAt(selection.end.line).range.end;
rangeToReplace = new vscode.Range(start, replacementEnd);
rangeToReplace =

Check failure on line 164 in src/ccs/commands/contextHelp.ts

View workflow job for this annotation

GitHub Actions / build 

Delete `⏎·······`
contextInfo.replacementRange ?? new vscode.Range(selection.start, selection.end);
}

await editor.edit((editBuilder) => {
Expand Down
Loading