From b7638b8fffe78ade657f361cadc08dffc8c10acf Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Mon, 27 Jun 2022 15:36:00 -0700
Subject: Language server fixes and improvements (#2304)

* Language server: Inlay hints.

* Signature help for base exprs that is not a declref.

* Fix checking of jvp operator.

* Fix.

* Add clang-format based auto formatting.

* Fix clang error.

* Fix clang-format discovery logic.

* Fine tune auto formatting and completion experience.

* Update macos workflow.

* Fixes to configurations.

* Fix parser recovery to trigger completion for index exprs.

* Typo fix.

Co-authored-by: Yong He <yhe@nvidia.com>
---
 build/visual-studio/slang/slang.vcxproj         |  4 ++++
 build/visual-studio/slang/slang.vcxproj.filters | 12 ++++++++++++
 2 files changed, 16 insertions(+)

(limited to 'build/visual-studio')

diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index c20633c34..9abc7869b 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -416,8 +416,10 @@ IF EXIST ..\..\..\external\slang-binaries\bin\windows-aarch64\slang-glslang.dll\
     <ClInclude Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.h" />
     <ClInclude Include="..\..\..\source\slang\slang-ir.h" />
     <ClInclude Include="..\..\..\source\slang\slang-language-server-ast-lookup.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-language-server-auto-format.h" />
     <ClInclude Include="..\..\..\source\slang\slang-language-server-completion.h" />
     <ClInclude Include="..\..\..\source\slang\slang-language-server-document-symbols.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-language-server-inlay-hints.h" />
     <ClInclude Include="..\..\..\source\slang\slang-language-server-semantic-tokens.h" />
     <ClInclude Include="..\..\..\source\slang\slang-language-server.h" />
     <ClInclude Include="..\..\..\source\slang\slang-legalize-types.h" />
@@ -572,8 +574,10 @@ IF EXIST ..\..\..\external\slang-binaries\bin\windows-aarch64\slang-glslang.dll\
     <ClCompile Include="..\..\..\source\slang\slang-ir-wrap-structured-buffers.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-ir.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-language-server-ast-lookup.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-language-server-auto-format.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-language-server-completion.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-language-server-document-symbols.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-language-server-inlay-hints.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-language-server-semantic-tokens.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-language-server.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-legalize-types.cpp" />
diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters
index cb3e0f278..a3f82db41 100644
--- a/build/visual-studio/slang/slang.vcxproj.filters
+++ b/build/visual-studio/slang/slang.vcxproj.filters
@@ -345,12 +345,18 @@
     <ClInclude Include="..\..\..\source\slang\slang-language-server-ast-lookup.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-language-server-auto-format.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-language-server-completion.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-language-server-document-symbols.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-language-server-inlay-hints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-language-server-semantic-tokens.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -809,12 +815,18 @@
     <ClCompile Include="..\..\..\source\slang\slang-language-server-ast-lookup.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-language-server-auto-format.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-language-server-completion.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-language-server-document-symbols.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-language-server-inlay-hints.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-language-server-semantic-tokens.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-- 
cgit v1.2.3