summaryrefslogtreecommitdiffstats
path: root/build/visual-studio
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2022-06-07 14:10:49 -0700
committerGitHub <noreply@github.com>2022-06-07 14:10:49 -0700
commit0c64995ea28febcc7d38e1519da8d93391ce2e7d (patch)
tree8696ab86b29caf80c3ebbd205c700e24b8c20bf3 /build/visual-studio
parent8c4a15c522861d2f30eacc9cd2b03ad793018639 (diff)
Major language server features. (#2264)
* Major language server features. * Include slangd in binary release. * Fix compiler issues. * Fix compiler error. * Completion resolve. * Various improvements. * Update diagnostic test expected output. * Bug fix for source locations. * Adjust diagnostic update frequency. * Update github actions to store artifacts. * Fix infinite parser loop. * Fix parser recovery. * Fix parser recovery. * Update test. * Fix test. * Disable IR gen for language server. * Allow commit characters in auto completion. * Fix lookup for invoke exprs. * More parser robustness fixes. * update solution file Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'build/visual-studio')
-rw-r--r--build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters12
-rw-r--r--build/visual-studio/slang/slang.vcxproj12
-rw-r--r--build/visual-studio/slang/slang.vcxproj.filters36
-rw-r--r--build/visual-studio/slangd/slangd.vcxproj7
-rw-r--r--build/visual-studio/slangd/slangd.vcxproj.filters16
5 files changed, 56 insertions, 27 deletions
diff --git a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters
index 87f24f154..dffe6e25e 100644
--- a/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters
+++ b/build/visual-studio/gfx-unit-test-tool/gfx-unit-test-tool.vcxproj.filters
@@ -71,6 +71,9 @@
<ClCompile Include="..\..\..\tools\gfx-unit-test\nested-parameter-block.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\tools\gfx-unit-test\ray-tracing-tests.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\tools\gfx-unit-test\resolve-resource-tests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -98,9 +101,6 @@
<ClCompile Include="..\..\..\tools\unit-test\slang-unit-test.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\tools\gfx-unit-test\ray-tracing-tests.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\tools\gfx-unit-test\buffer-barrier-test.slang">
@@ -124,6 +124,9 @@
<None Include="..\..\..\tools\gfx-unit-test\nested-parameter-block.slang">
<Filter>Source Files</Filter>
</None>
+ <None Include="..\..\..\tools\gfx-unit-test\ray-tracing-test-shader.slang">
+ <Filter>Source Files</Filter>
+ </None>
<None Include="..\..\..\tools\gfx-unit-test\resolve-resource-shader.slang">
<Filter>Source Files</Filter>
</None>
@@ -139,8 +142,5 @@
<None Include="..\..\..\tools\gfx-unit-test\trivial-copy.slang">
<Filter>Source Files</Filter>
</None>
- <None Include="..\..\..\tools\gfx-unit-test\ray-tracing-test-shader.slang">
- <Filter>Source Files</Filter>
- </None>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index 89e69b55c..dffc48700 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -406,6 +406,11 @@ IF EXIST ..\..\..\external\slang-binaries\bin\windows-aarch64\slang-glslang.dll\
<ClInclude Include="..\..\..\source\slang\slang-ir-witness-table-wrapper.h" />
<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-collect-member.h" />
+ <ClInclude Include="..\..\..\source\slang\slang-language-server-protocol.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" />
<ClInclude Include="..\..\..\source\slang\slang-lookup.h" />
<ClInclude Include="..\..\..\source\slang\slang-lower-to-ir.h" />
@@ -438,6 +443,7 @@ IF EXIST ..\..\..\external\slang-binaries\bin\windows-aarch64\slang-glslang.dll\
<ClInclude Include="..\..\..\source\slang\slang-type-system-shared.h" />
<ClInclude Include="..\..\..\source\slang\slang-value-reflect.h" />
<ClInclude Include="..\..\..\source\slang\slang-visitor.h" />
+ <ClInclude Include="..\..\..\source\slang\slang-workspace-version.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\prelude\slang-cpp-host-prelude.h.cpp" />
@@ -550,6 +556,11 @@ IF EXIST ..\..\..\external\slang-binaries\bin\windows-aarch64\slang-glslang.dll\
<ClCompile Include="..\..\..\source\slang\slang-ir-witness-table-wrapper.cpp" />
<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-collect-member.cpp" />
+ <ClCompile Include="..\..\..\source\slang\slang-language-server-protocol.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" />
<ClCompile Include="..\..\..\source\slang\slang-lookup.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-lower-to-ir.cpp" />
@@ -579,6 +590,7 @@ IF EXIST ..\..\..\external\slang-binaries\bin\windows-aarch64\slang-glslang.dll\
<ClCompile Include="..\..\..\source\slang\slang-type-layout.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-type-system-shared.cpp" />
<ClCompile Include="..\..\..\source\slang\slang-value-reflect.cpp" />
+ <ClCompile Include="..\..\..\source\slang\slang-workspace-version.cpp" />
<ClCompile Include="..\..\..\source\slang\slang.cpp" />
</ItemGroup>
<ItemGroup>
diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters
index a414d7e6a..8721de464 100644
--- a/build/visual-studio/slang/slang.vcxproj.filters
+++ b/build/visual-studio/slang/slang.vcxproj.filters
@@ -315,6 +315,21 @@
<ClInclude Include="..\..\..\source\slang\slang-ir.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\source\slang\slang-language-server-ast-lookup.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\source\slang\slang-language-server-collect-member.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\source\slang\slang-language-server-protocol.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\source\slang\slang-language-server-semantic-tokens.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\source\slang\slang-language-server.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\source\slang\slang-legalize-types.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -411,6 +426,9 @@
<ClInclude Include="..\..\..\source\slang\slang-visitor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\source\slang\slang-workspace-version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\prelude\slang-cpp-host-prelude.h.cpp">
@@ -743,6 +761,21 @@
<ClCompile Include="..\..\..\source\slang\slang-ir.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\source\slang\slang-language-server-ast-lookup.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\source\slang\slang-language-server-collect-member.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\source\slang\slang-language-server-protocol.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\source\slang\slang-language-server-semantic-tokens.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\source\slang\slang-language-server.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\source\slang\slang-legalize-types.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -830,6 +863,9 @@
<ClCompile Include="..\..\..\source\slang\slang-value-reflect.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\source\slang\slang-workspace-version.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\source\slang\slang.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/build/visual-studio/slangd/slangd.vcxproj b/build/visual-studio/slangd/slangd.vcxproj
index d52a5b466..920bb2be5 100644
--- a/build/visual-studio/slangd/slangd.vcxproj
+++ b/build/visual-studio/slangd/slangd.vcxproj
@@ -262,12 +262,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\tools\slangd\language-server-protocol.h" />
- <ClInclude Include="..\..\..\tools\slangd\language-server.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\tools\slangd\language-server-protocol.cpp" />
- <ClCompile Include="..\..\..\tools\slangd\language-server.cpp" />
+ <ClCompile Include="..\..\..\tools\slangd\main.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\compiler-core\compiler-core.vcxproj">
diff --git a/build/visual-studio/slangd/slangd.vcxproj.filters b/build/visual-studio/slangd/slangd.vcxproj.filters
index b21b4cc7f..5028415fd 100644
--- a/build/visual-studio/slangd/slangd.vcxproj.filters
+++ b/build/visual-studio/slangd/slangd.vcxproj.filters
@@ -1,26 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <Filter Include="Header Files">
- <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
- </Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\tools\slangd\language-server-protocol.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\tools\slangd\language-server.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\tools\slangd\language-server-protocol.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\tools\slangd\language-server.cpp">
+ <ClCompile Include="..\..\..\tools\slangd\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>