Merge branch 'main' into gabriela/simulator-seed-printing

informalsystems · Oct 22, 2024 · a70a73d · a70a73d
2 parents 6eac6bc + d2f00a0
commit a70a73d
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+
+- Hashbang lines are now properly highlighted as comments in vscode and in highlight.js.
+
+### Security
+
+## v0.22.2 -- 2024-10-08
+
 ### Added
 
 - `quint verify` has the option `--apalache-version` to pull a custom version (#1521)

diff --git a/editor-plugins/highlight.js/quint.js b/editor-plugins/highlight.js/quint.js
@@ -38,6 +38,7 @@ function quintHljs(hljs) {
         scope: 'number',
         begin: '-?(0x[0-9a-fA-F]([0-9a-fA-F]|_[0-9a-fA-F])*|0|[1-9]([0-9]|_[0-9])*)',
       },
+      hljs.SHEBANG, // file-leading hashbang
       hljs.C_LINE_COMMENT_MODE,  // single line comments
       hljs.C_BLOCK_COMMENT_MODE, // multiline comments
     ],

diff --git a/quint/package-lock.json b/quint/package-lock.json
diff --git a/quint/package.json b/quint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@informalsystems/quint",
-  "version": "0.22.1",
+  "version": "0.22.2",
   "description": "Core tool for the Quint specification language",
   "keywords": [
     "temporal",

diff --git a/quint/src/version.ts b/quint/src/version.ts
@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '0.22.1'
+export const version = '0.22.2'
diff --git a/vscode/quint-vscode/CHANGELOG.md b/vscode/quint-vscode/CHANGELOG.md
@@ -14,6 +14,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+## v0.14.8 -- 2024-10-18
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+## v0.14.7 -- 2024-10-08
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
 ## v0.14.6 -- 2024-09-25
 
 ### Added

diff --git a/vscode/quint-vscode/package-lock.json b/vscode/quint-vscode/package-lock.json
diff --git a/vscode/quint-vscode/package.json b/vscode/quint-vscode/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Quint",
 	"description": "Language support for Quint specifications",
 	"icon": "./icons/logo.png",
-	"version": "0.14.6",
+	"version": "0.14.8",
 	"publisher": "informal",
 	"engines": {
 		"vscode": "^1.52.0"

diff --git a/vscode/quint-vscode/server/package-lock.json b/vscode/quint-vscode/server/package-lock.json
diff --git a/vscode/quint-vscode/server/package.json b/vscode/quint-vscode/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@informalsystems/quint-language-server",
   "description": "Language Server for the Quint specification language",
-  "version": "0.14.6",
+  "version": "0.14.8",
   "author": "Informal Systems",
   "contributors": [
     {
@@ -43,7 +43,7 @@
     "test/**/*.ts"
   ],
   "dependencies": {
-    "@informalsystems/quint": "^0.22.1",
+    "@informalsystems/quint": "^0.22.2",
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.1",
     "vscode-uri": "^3.0.7"

diff --git a/vscode/quint-vscode/syntaxes/quint.tmLanguage.json b/vscode/quint-vscode/syntaxes/quint.tmLanguage.json
@@ -2,6 +2,9 @@
 	"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
 	"name": "Quint",
 	"patterns": [
+		{
+			"include": "#hashbangLine"
+		},
 		{
 			"include": "#lineComments"
 		},
@@ -92,6 +95,14 @@
 				}
 			]
 		},
+		"hashbangLine": {
+			"patterns": [
+				{
+					"name": "comment.line.hashbang.quint",
+					"match": "^#!.*$"
+				}
+			]
+		},
 		"lineComments": {
 			"patterns": [
 				{