Merge pull request #10 from GaijinEntertainment/version-1.4.0

Version 1.4.0 Pre-release
GaijinEntertainment · Mar 22, 2024 · 34576aa · 34576aa
2 parents 5032e8e + 3c402cb
commit 34576aa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change Log
 
-## [1.3.0] - 2024.02.14.
+## [1.4.0 Pre-release] - 2024.03.22.
+
+### Added
+
+-   Code formatting (normal, range, ranges)
+
+## [1.3.0] - 2024.03.14.
 
 ### Added
 
@@ -32,7 +38,7 @@
 -   Using the cleaned content of DSHL macros for expansion instead of the original to get rid of comments
 -   Fixing a bug in HLSL macro expansion, where positions were wrong positions were computed
 
-## [1.2.0] - 2024.01.15.
+## [1.2.0] - 2024.02.15.
 
 ### Added
 

diff --git a/Dagor-Shader-Language-Server b/Dagor-Shader-Language-Server
diff --git a/README.md b/README.md
@@ -119,6 +119,10 @@ If you have any problems or feature request for the extension, feel free to crea
 
 For more information, see the [changelog](CHANGELOG.md).
 
+### 1.4.0 Pre-release
+
+-   Code formatting
+
 ### 1.3.0
 
 -   Code completion (for DSHL variables, shaders, and block statements)

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "displayName": "Dagor Shader Language Support",
     "description": "Language support extension for the Dagor Shader Language.",
     "publisher": "gaijin",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "license": "BSD-3-Clause",
     "repository": {
         "type": "git",
@@ -116,10 +116,10 @@
         "build-production": "webpack --mode production",
         "build": "webpack",
         "watch": "webpack --watch",
-        "package-universal": "vsce package --ignoreFile vscodeignore/universal.vscodeignore",
-        "package-windows-x64": "vsce package --target win32-x64 --ignoreFile vscodeignore/windows.vscodeignore",
-        "package-macos-x64": "vsce package --target darwin-x64 --ignoreFile vscodeignore/macos.vscodeignore",
-        "package-linux-x64": "vsce package --target linux-x64 --ignoreFile vscodeignore/linux.vscodeignore",
+        "package-universal": "vsce package --ignoreFile vscodeignore/universal.vscodeignore --pre-release",
+        "package-windows-x64": "vsce package --target win32-x64 --ignoreFile vscodeignore/windows.vscodeignore --pre-release",
+        "package-macos-x64": "vsce package --target darwin-x64 --ignoreFile vscodeignore/macos.vscodeignore --pre-release",
+        "package-linux-x64": "vsce package --target linux-x64 --ignoreFile vscodeignore/linux.vscodeignore --pre-release",
         "package-all": "start npm run package-universal & start npm run package-windows-x64 & start npm run package-macos-x64 & start npm run package-linux-x64",
         "build-tests": "tsc -p ./tsconfig.test.json",
         "watch-tests": "tsc -w -p ./tsconfig.test.json",
+2 −0		grammar/antlr/DshlLexer.g4
+1 −1		grammar/antlr/DshlParser.g4
+4 −12		src/core/document-info.ts
+4 −0		src/helper/file-helper.ts
+26 −0		src/helper/helper.ts
+1 −0		src/interface/host-dependent.ts
+341 −0		src/provider/formatting-provider.ts
+2 −0		src/server-desktop.ts
+3 −0		src/server-web.ts
+11 −0		src/server.ts