-
Notifications
You must be signed in to change notification settings - Fork 36
Add support in LSP eval integration for selection evaluation #504
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.
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
Merged
charlieegan3
merged 3 commits into
open-policy-agent:main
from
charlieegan3:inline-eval-coverage
Oct 1, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,3 +19,4 @@ words: | |
| ignoreWords: | ||
| - tjons # OPA contributor GH handle | ||
| - dprint | ||
| - Ledford | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import * as vscode from "vscode"; | ||
|
|
||
| import { opaOutputShowError } from "./output"; | ||
|
|
||
| let lastEvalSelectionRange: { fileName: string; startRow: number; endRow: number } | undefined; | ||
|
|
||
| export function consumeEvalSelectionCoverageFilter(): (fileName: string, ranges: any[]) => any[] { | ||
| const range = lastEvalSelectionRange; | ||
| lastEvalSelectionRange = undefined; | ||
|
|
||
| return (fileName: string, ranges: any[]) => { | ||
| if (!range || !range.fileName.endsWith(fileName)) { | ||
| return ranges; | ||
| } | ||
|
|
||
| // Coverage inside the evaluated selection reflects the ad-hoc query, not the file, so | ||
| // drop it rather than show it as covered or not covered. | ||
| return ranges.filter((r: any) => !(r.start.row <= range.endRow && r.end.row >= range.startRow)); | ||
| }; | ||
| } | ||
|
|
||
| export async function evalSelection(editor: vscode.TextEditor) { | ||
| const selection = editor.selection; | ||
| let lastLine = selection.end.line; | ||
| if (selection.end.character === 0 && lastLine > selection.start.line) { | ||
| lastLine -= 1; | ||
| } | ||
|
|
||
| const args = { | ||
| target: editor.document.uri.toString(), | ||
| // "path" is the regal.eval command's field for the query text, not a file path. It can | ||
| // hold a plain query as well as a rule reference. | ||
| path: editor.document.getText(selection), | ||
| row: lastLine + 1, | ||
| }; | ||
|
|
||
| lastEvalSelectionRange = { | ||
| fileName: editor.document.fileName, | ||
| startRow: selection.start.line + 1, | ||
| endRow: lastLine + 1, | ||
| }; | ||
|
|
||
| try { | ||
| await vscode.commands.executeCommand("regal.eval", JSON.stringify(args)); | ||
| } catch (error) { | ||
| opaOutputShowError(error instanceof Error ? error.message : String(error)); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had some dprint issues and it was easier to make this a normal yaml list.