From 52281e97fe79ad789439ef22e5ff228684291db9 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Mon, 4 Dec 2023 10:40:07 +0100 Subject: [PATCH 1/2] support inlay hints inside functions remake of #759 Co-authored-by: ryuukk --- dsymbol/src/dsymbol/conversion/package.d | 1 + tests/tc_inlay_hints/expected.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/dsymbol/src/dsymbol/conversion/package.d b/dsymbol/src/dsymbol/conversion/package.d index 6b0df506..57e6626e 100644 --- a/dsymbol/src/dsymbol/conversion/package.d +++ b/dsymbol/src/dsymbol/conversion/package.d @@ -115,6 +115,7 @@ class AutocompleteParser : Parser { if (!currentIs(tok!"{")) return null; + if (cursorPosition == -1) return super.parseBlockStatement(); if (current.index > cursorPosition) { BlockStatement bs = allocator.make!(BlockStatement); diff --git a/tests/tc_inlay_hints/expected.txt b/tests/tc_inlay_hints/expected.txt index a01907cb..26f45961 100644 --- a/tests/tc_inlay_hints/expected.txt +++ b/tests/tc_inlay_hints/expected.txt @@ -1 +1,2 @@ l ->Point 208 +l ->Point 247 From b735f2bcc4e5d35bf775afcd9c0fea4bb84f4d87 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Mon, 4 Dec 2023 10:49:24 +0100 Subject: [PATCH 2/2] fix inlayHints ordering --- src/dcd/server/autocomplete/inlayhints.d | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dcd/server/autocomplete/inlayhints.d b/src/dcd/server/autocomplete/inlayhints.d index b5cd466d..41db78b3 100644 --- a/src/dcd/server/autocomplete/inlayhints.d +++ b/src/dcd/server/autocomplete/inlayhints.d @@ -104,5 +104,8 @@ public AutocompleteResponse getInlayHints(const AutocompleteRequest request, foreach(part; symbol.opSlice()) check(part, visited); } + + response.completions.sort!"a.symbolLocation < b.symbolLocation"; + return response; }