Some fixes #137
Open
Some fixes #137
Conversation
This file contains 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
Similar to C-c C-b, but without setting lax.
This also matched with the notation for typeclass arguments
(`{| eq a |}`), which is not intended. Though I think this
only happens when there is no space before it, e.g.
(a:Type){|deq a|}
It wasn't actually taking the executable into account!
cpitclaudel
reviewed
Jul 4, 2023
| @@ -867,7 +867,7 @@ allows composition in code comments." | |||
| '("open" "module" "include" "friend" | |||
| "let" "let rec" "val" "and" "assume" | |||
| "exception" "effect" "new_effect" "sub_effect" "new_effect_for_free" "layered_effect" | |||
| "kind" "type" "class" "instance")) | |||
| "kind" "type" "class" "instance" "%splice")) | |||
There was a problem hiding this comment.
Why add this here if you also add it below?
cpitclaudel
requested changes
Jul 4, 2023
| @@ -1123,7 +1123,7 @@ leads to the binder's start." | |||
| (defun fstar-find-subtype-annotation (bound) | |||
| "Find {...} group between point and BOUND." | |||
| (let ((found) (end)) | |||
| (while (and (not found) (re-search-forward "{[^:].*}" bound t)) | |||
| (while (and (not found) (re-search-forward "{[^:|].*}" bound t)) | |||
There was a problem hiding this comment.
I don't know enough about the syntax to comment on this
| @@ -1167,6 +1167,8 @@ leads to the binder's start." | |||
| (,(concat "\\_<\\(val\\) +\\(" id "\\) *:") | |||
| (1 'fstar-structure-face) | |||
| (2 'font-lock-function-name-face)) | |||
| (, "%splice" | |||
| @@ -3495,6 +3497,14 @@ into blocks; process it as one large block instead." | |||
| (let ((fstar-subp--lax t)) | |||
| (fstar-subp-advance-or-retract-to-point arg))) | |||
|
|
|||
| (defun fstar-subp-advance-to-point-max (&optional arg) | |||
| "Like `fstar-subp-advance-or-retract-to-point' on `point-max'. | |||
| Pass ARG to `fstar-subp-advance-or-retract-to-point'." | |||
There was a problem hiding this comment.
Can you refactor the function below to use this new one?
| @@ -5323,6 +5334,7 @@ This is useful to spot discrepancies between the CLI and IDE frontends." | |||
| ("C-c C-l" "C-S-l" fstar-subp-advance-or-retract-to-point-lax) | |||
| ("C-c C-." "C-S-." fstar-subp-goto-beginning-of-unprocessed-region) | |||
| ("C-c C-b" "C-S-b" fstar-subp-advance-to-point-max-lax) | |||
| ("C-c C-g" "C-S-g" fstar-subp-advance-to-point-max) | |||
There was a problem hiding this comment.
A keybinding ending in C-g is going to be very very confusing, because C-g is the universal "cancel" action
| @@ -5488,6 +5502,7 @@ its `find-image' forms." | |||
| (define-key-after map [basic-actions-sep] '(menu-item "--")) | |||
| (add-item 'fstar-subp-advance-next "next") | |||
| (add-item 'fstar-subp-advance-next-lax "next-lax") | |||
| (add-item 'fstar-subp-advance-to-point-max "goto-end") | |||
There was a problem hiding this comment.
Is there a corresponding picture in the repo already?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Some misc fixes, the last one is the only "serious" one I'd say. Also,
I added a C-c C-g to start checking the whole file (in normal mode, not
lax), I think there isn't something like this already?
As usual my emacs-foo is weak, so take everything with a grain of salt :-)