-
Notifications
You must be signed in to change notification settings - Fork 237
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
refactor-open: don't return useless edits #1314
Merged
Merged
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
5 tasks
72e84d6
to
e70715c
Compare
e70715c
to
43980e7
Compare
This was referenced Jun 14, 2021
(I'll have a look at this next week) |
trefis
reviewed
Jul 5, 2021
43980e7
to
344d31c
Compare
I'll let you rebase and update the changelog entry before giving it one last look (and merging). |
aadf331
to
2e37896
Compare
(works only for single-line idents)
2e37896
to
d1a9313
Compare
@trefis this should be ready
…On Tue, 6 Jul 2021 at 17:49, Thomas Refis ***@***.***> wrote:
I'll let you rebase and update the changelog entry before giving it one
last look (and merging).
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#1314 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AD4YR66DATICSPH6EL6I77DTWL3WDANCNFSM42W3ON4Q>
.
|
- fix naming of tests
3111a19
to
9f40421
Compare
voodoos
added a commit
to voodoos/merlin
that referenced
this pull request
Jul 20, 2021
refactor-open: don't return useless edits
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 04:45:37 PM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` can be use to change the depth of the recursive construction. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318) - disable tests failing in Opam's CI due to nested dune projects (ocaml/merlin#1373)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 04:45:37 PM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` can be use to change the depth of the recursive construction. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318) - disable tests failing in Opam's CI due to nested dune projects (ocaml/merlin#1373)
voodoos
added a commit
to voodoos/opam-repository
that referenced
this pull request
Jul 26, 2021
CHANGES: Mon Jul 26 04:45:37 PM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` can be use to change the depth of the recursive construction. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318) - disable tests failing in Opam's CI due to nested dune projects (ocaml/merlin#1373)
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.
Before this PR
refactor-open
returns edits that when applied do not change the document, e.g,Calling
unqualify
on this:returned
This is a hacky solution though, which doesn't work for multi-line identifiers (which are rare in OCaml, I guess). A proper solution would involve changing
Mbrowse.node_paths
to returnlongident
s along with paths. I would appreciate input on which way to go.Notes: