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

Fix uri to_string #1197

Merged
merged 1 commit into from
Oct 18, 2023
Merged

Fix uri to_string #1197

merged 1 commit into from
Oct 18, 2023

Conversation

bzy-debug
Copy link
Contributor

The current implementation is not the same as uri.ts

see https://github.com/microsoft/vscode-uri/blob/96acdc0be5f9d5f2640e1c1f6733bbf51ec95177/src/uri.ts#L601

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

@rgrinberg rgrinberg added this to the 1.17.0 milestone Oct 16, 2023
@rgrinberg
fix: encode uri's like vscode
a05273e 
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"
@rgrinberg rgrinberg merged commit 6bda990 into ocaml:master Oct 18, 2023
9 checks passed
@voodoos voodoos mentioned this pull request Dec 18, 2023
Merged
voodoos added a commit to voodoos/opam-repository that referenced this pull request Dec 18, 2023
@voodoos
[new release] lsp (3 packages) (1.17.0)
cba4371 
CHANGES:

## Fixes

- Fix missing super & subscripts in markdown documentation. (ocaml/ocaml-lsp#1170)

- Do not invoke dune at all if `--fallback-read-dot-merlin` flag is on. (ocaml/ocaml-lsp#1173)

- Fix semantic highlighting of infix operators that contain '.'. (ocaml/ocaml-lsp#1186)

- Disable highlighting unit as an enum member to fix comment highlighting bug. (ocaml/ocaml-lsp#1185)

- Improve type-on-hover and type-annotate efficiency by only formatting the type
  of the first enclosing. (ocaml/ocaml-lsp#1191, ocaml/ocaml-lsp#1196)

- Fix the encoding of URI's to match how vscode does it (ocaml/ocaml-lsp#1197)

- Fix parsing of completion prefixes (ocaml/ocaml-lsp#1181)

## Features

- Compatibility with Odoc 2.3.0, with support for the introduced syntax: tables,
  and "codeblock output" (ocaml/ocaml-lsp#1184)

- Display text of references in doc strings (ocaml/ocaml-lsp#1166)

- Add mark/remove unused actions for open, types, for loop indexes, modules,
  match cases, rec, and constructors (ocaml/ocaml-lsp#1141)

- Offer auto-completion for the keyword `in` (ocaml/ocaml-lsp#1217)
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.
nberth pushed a commit to nberth/opam-repository that referenced this pull request Jun 18, 2024
@voodoos @nberth
[new release] lsp (3 packages) (1.17.0)
8ec8c73 
CHANGES:

## Fixes

- Fix missing super & subscripts in markdown documentation. (ocaml/ocaml-lsp#1170)

- Do not invoke dune at all if `--fallback-read-dot-merlin` flag is on. (ocaml/ocaml-lsp#1173)

- Fix semantic highlighting of infix operators that contain '.'. (ocaml/ocaml-lsp#1186)

- Disable highlighting unit as an enum member to fix comment highlighting bug. (ocaml/ocaml-lsp#1185)

- Improve type-on-hover and type-annotate efficiency by only formatting the type
  of the first enclosing. (ocaml/ocaml-lsp#1191, ocaml/ocaml-lsp#1196)

- Fix the encoding of URI's to match how vscode does it (ocaml/ocaml-lsp#1197)

- Fix parsing of completion prefixes (ocaml/ocaml-lsp#1181)

## Features

- Compatibility with Odoc 2.3.0, with support for the introduced syntax: tables,
  and "codeblock output" (ocaml/ocaml-lsp#1184)

- Display text of references in doc strings (ocaml/ocaml-lsp#1166)

- Add mark/remove unused actions for open, types, for loop indexes, modules,
  match cases, rec, and constructors (ocaml/ocaml-lsp#1141)

- Offer auto-completion for the keyword `in` (ocaml/ocaml-lsp#1217)
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.
2 participants
@bzy-debug @rgrinberg