diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b7ae4a..96d7ff7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,12 +24,18 @@ jobs:
             - name: Install dependencies for the language server
               run: npm ci
               working-directory: ./Dagor-Shader-Language-Server
-            - name: Generate ANTLR lexer
+            - name: Generate condition ANTLR lexer
               run: npx antlr4ts -o "../../src/_generated" "ConditionLexer.g4"
               working-directory: ./Dagor-Shader-Language-Server/grammar/antlr
-            - name: Generate ANTLR parser
+            - name: Generate condition ANTLR parser
               run: npx antlr4ts -o "../../src/_generated" -no-listener -visitor "ConditionParser.g4"
               working-directory: ./Dagor-Shader-Language-Server/grammar/antlr
+            - name: Generate DSHL ANTLR lexer
+              run: npx antlr4ts -o "../../src/_generated" "DshlLexer.g4"
+              working-directory: ./Dagor-Shader-Language-Server/grammar/antlr
+            - name: Generate DSHL ANTLR parser
+              run: npx antlr4ts -o "../../src/_generated" -no-listener -visitor "DshlParser.g4"
+              working-directory: ./Dagor-Shader-Language-Server/grammar/antlr
             - name: Build
               run: npm run build
             - name: Build the tests
diff --git a/Dagor-Shader-Language-Server b/Dagor-Shader-Language-Server
index a79cb46..23f8253 160000
--- a/Dagor-Shader-Language-Server
+++ b/Dagor-Shader-Language-Server
@@ -1 +1 @@
-Subproject commit a79cb461070f02e9ab35efa056e406042b650abf
+Subproject commit 23f825314edbe788ab38bf4fdd1f1a22cc3cef7d