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

Completion edge cases #1212

Merged
merged 40 commits into from
Nov 27, 2023
Merged

Completion edge cases #1212

merged 40 commits into from
Nov 27, 2023

Conversation

rgrinberg
Copy link
Member

No description provided.

faldor20 and others added 28 commits September 18, 2023 18:37
@faldor20
Tests passing
96376d1
@faldor20
Added support for whitespace in completion
9bb112a 
The solution here is to change all whitespace to spaces for ease of regex matching(all whitespace is equivelent semantically) and then remove all spaces from the prefix that's passed to merlin.
@faldor20
Addded ability to have whitespace before or after the dot and test.
0b1920e
@faldor20
finished cleanup and added support for monadic bind.
cfde1e0
@faldor20
removed pointless regex
f6a031c
@faldor20
reversed implimentation
bfddc86
@faldor20
fixed everything other than combinators
f84be2f
@faldor20
fixed formatting and removed unnecissary import
1fce0d6
@faldor20
Misc fixes, names, formatting, etc converted to Re syntax for regex, …
4d720d0 
…cleaned up Testing module exports
@faldor20
removed old prefix_parser
59e82fa
@faldor20
renamed regexes
a4c690b
@faldor20
Removed unnecessary Option extension
abb05c9
@faldor20
spelling
5b07aca
@faldor20
converted to forward regex for simplicity
96c104e 
converted to forward regex
@faldor20
Added Long file for benchmarking and removed unused benchmarks
cbaa820
@faldor20
Merge branch 'master-origin'
1841030
@faldor20
Initial code for new-e2e tests for completion
26476a6
@faldor20
Finished adding completion tests
766509c
@faldor20
converted last few missed tests
0fbea39
@faldor20
formatting
b27e3cc
@faldor20
removed old tests
b746bd5
@faldor20
added interface
e7008b9
@faldor20
fix bad interface
c4249a8
@faldor20
Merge branch 'master-origin'
6aa39f3
@faldor20
Trying to get benchmarks to build fine
bdaa47c
@rgrinberg
disable benchmarking by default b/c they're disuptive
d7692fc 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
Merge remote-tracking branch 'origin/master' into completion-edge-cases
26b2bf2
@rgrinberg
fmt
5dc058f 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@coveralls
Copy link

coveralls commented Nov 26, 2023 •
edited
Loading

Pull Request Test Coverage Report for Build 4038

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 25 of 25 (100.0%) changed or added relevant lines in 3 files are covered.
  • 8 unchanged lines in 2 files lost coverage.
  • Overall coverage increased (+1.3%) to 20.34%
Files with Coverage Reduction New Missed Lines %
ocaml-lsp-server/src/compl.ml 2 54.68%
ocaml-lsp-server/src/import.ml 6 28.57%
Totals Coverage Status
Change from base Build 4011: 1.3%
Covered Lines: 4829
Relevant Lines: 23741
💛 - Coveralls

@rgrinberg
_
b659cef 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
5590fe9 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
3d6dfe4 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
d3b0ff0 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
6cc4a7b 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
fa204d4 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
7556c33 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
186a3e3 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
55e80af 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
f1edd2c 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg
_
5fe326e 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg rgrinberg added this to the 1.17.0 milestone Nov 27, 2023
@rgrinberg
_
e24f202 
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
@rgrinberg rgrinberg mentioned this pull request Nov 27, 2023
Closed
@rgrinberg rgrinberg merged commit 73bf594 into ocaml:master Nov 27, 2023
8 of 9 checks passed
voodoos added a commit to voodoos/ocaml-lsp that referenced this pull request Jan 29, 2024
@voodoos
Squashed commit of the following:
1e63328 
commit ccedef9
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Wed Jan 3 17:42:08 2024 +0100

    fmt

commit 1c3ebfd
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Wed Jan 3 17:41:52 2024 +0100

    rename: support project-wide but unsafe renaming

commit 7105c12
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Thu Nov 30 16:22:28 2023 +0100

    wip: make rename project wide

commit ba1d99a
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Thu Nov 30 14:49:28 2023 +0100

    Notify the user when the index is out of date

commit ef50a83
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Wed Nov 29 19:00:28 2023 +0100

    wip: get desync info from merlin

commit 5265d22
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Wed Nov 22 11:12:48 2023 +0100

    Handle new `unit_name` config directive

commit 2367339
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Thu Oct 26 15:50:49 2023 +0200

    Fix merlin config merging

commit 55ab533
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Wed Oct 25 16:33:38 2023 +0200

    config: accept index_file directive

commit e353220
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Fri Sep 29 14:23:32 2023 +0200

    Apply compiler libs changes

commit 69fea3a
Author: Ulysse Gérard <thevoodoos@gmail.com>
Date:   Tue Jun 13 17:42:00 2023 +0200

    Support project wide occurrences

commit d3d8de5
Author: Ulysse <5031221+voodoos@users.noreply.github.com>
Date:   Mon Dec 18 16:34:42 2023 +0100

    Prepare release 1.17.0 (ocaml#1219)

    * chore: restore lost version number in changes
         (erased in c8c1096)

    * chore: bump version number in changes before release

commit f9de892
Author: Ulugbek Abdullaev <ulugbekna@gmail.com>
Date:   Mon Dec 11 19:51:35 2023 +0100

    Completion for `in` keyword (ocaml#1217)

    feat(auto-completion): auto-complete `in` (in a hacky way) in .ml files

commit 9dc8de2
Author: Jules Aguillon <jules@j3s.fr>
Date:   Mon Nov 27 04:29:17 2023 +0100

    Upgrade OCamlformat to 0.26.1 (ocaml#1177)

commit 2ffaea0
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Sun Nov 26 20:29:02 2023 -0600

    chore: move dune-release to own shell (ocaml#1215)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

commit 17eec24
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Sun Nov 26 20:07:08 2023 -0600

    chore: update flakes (ocaml#1214)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

commit 73bf594
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Sun Nov 26 19:51:42 2023 -0600

    Completion edge cases (ocaml#1212)

    * Tests passing

    * Added support for whitespace in completion
    The solution here is to change all whitespace to spaces for ease of regex matching(all whitespace is equivelent semantically) and then remove all spaces from the prefix that's passed to merlin.

    Co-authored-by: faldor20 <eli.jambu@gmail.com>
    Co-authored-by: faldor20 <eli.jambu@yahoo.com>

commit 3b3b9bc
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Sun Nov 26 18:58:33 2023 -0600

    fix: hack to workaround dune bug (ocaml#1213)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

commit c6eafd8
Author: panglesd <peada@free.fr>
Date:   Sun Oct 22 09:32:24 2023 +0200

    Compatibility with odoc-parser.2.3.0 (ocaml#1184)

    * compatibility with odoc-parser.2.3.0

    Signed-off-by: Paul-Elliot <peada@free.fr>

commit 6f78852
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Tue Oct 17 23:36:08 2023 -0600

    fix(test): correctly qualify pp dep (ocaml#1203)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

commit 6bda990
Author: Bao Zhiyuan <71200607+bzy-debug@users.noreply.github.com>
Date:   Wed Oct 18 13:35:39 2023 +0800

    Fix uri to_string (ocaml#1197)

    The current implementation is not the same as uri.ts

    see microsoft/vscode-uri@96acdc0/src/uri.ts#L601

    the ts code just checks if authority is empty, while ocaml code checks
    if authority is "file"

    Co-authored-by: Bao Zhiyuan <baozhiyuan@idea.edu.cn>

commit e0c4df3
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Mon Oct 16 22:36:44 2023 -0600

    fix: odoc-parser constraints (ocaml#1204)

    we aren't compatible with 2.3.0

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

commit eca77cf
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Mon Oct 16 14:58:31 2023 -0600

    chore: more CHANGES formatting (ocaml#1202)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

commit 208683e
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Mon Oct 16 12:25:13 2023 -0600

    chore: better formatting in CHANGES (ocaml#1201)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

commit ce2e46b
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Mon Oct 16 11:21:19 2023 -0600

    chore: update flakes (ocaml#1195)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

commit 841fe5c
Author: Rudi Grinberg <me@rgrinberg.com>
Date:   Mon Oct 16 11:16:05 2023 -0600

    refactor: fix against newer versions of dune (ocaml#1200)

    removes the incomplete pattern match warning on the progress

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

commit 672ca1b
Author: Ulysse <5031221+voodoos@users.noreply.github.com>
Date:   Wed Oct 4 00:14:05 2023 +0200

    Only return first result for type_enclosing. (ocaml#1196)

    in `type-annotate` code action.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.17.0
Development

Successfully merging this pull request may close these issues.
3 participants
@rgrinberg @coveralls @faldor20