Merge branch 'release-candidate/1.0.0-rc-2' into 'main'

Release 1.0.0-rc-2 - iteration 2 Closes #5 and #4 See merge request SNDST00M/vscode-textmate-languageservice!3
vsce-toolroom · Jan 27, 2023 · 389a746 · 389a746
2 parents ab28981 + 31b5287
commit 389a746
Show file tree

Hide file tree

Showing 33 changed files with 8,122 additions and 1,139 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -128,7 +128,11 @@
 			"error",
 			{
 				"code": 120,
-				"ignorePattern": "^(?!\\s*\\}?\\s*(?:else|if|else\\s+if)\\s*).*\\{$"
+				"ignorePattern": "^(?!\\s*\\}?\\s*(?:else|if|else\\s+if)\\s*).*\\{$",
+				"ignoreRegExpLiterals": true,
+				"ignoreStrings": true,
+				"ignoreTemplateLiterals": true,
+				"ignoreUrls": true
 			}
 		],
 		"new-parens": "error",

diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 **/textmate-configuration.json linguist-language=jsonc
+build linguist-language=bash
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 out/
 node_modules/
 **/.vscode-test/
-package-lock.json
 **/*.tgz
 *.vsix
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,27 @@
+.shared_windows_runners:
+  tags:
+  - shared-windows
+  - windows
+  - windows-1809
+
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+  GIT_SUBMODULE_DEPTH: 0
+
+cache:
+  paths:
+  - node_modules/
+
+stages:
+- test
+
+test:
+  extends:
+  - .shared_windows_runners
+  stage: test
+  script:
+  - npm install
+  - npm test
+  artifacts:
+    paths:
+    - test/data/
diff --git a/.npmignore b/.npmignore
@@ -1,6 +1,6 @@
 .vscode/
 .vscode-test/
-.github/
+.gitlab/
 build/
 src/
 test/
@@ -12,11 +12,14 @@ assets/
 .eslintignore
 .gitattributes
 .gitignore
+.gitlab-ci.yml
 .gitmodules
 .travis.yml
 .eslintignore
 .eslintrc.json
 .mocharc.json
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
+Dockerfile
 tsconfig.json
+wheel
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,13 @@
 {
 	"files.associations": {
-		"textmate-configuration.json": "jsonc"
+		"textmate-configuration.json": "jsonc",
+		"build": "shellscript"
+	},
+	"git.ignoredRepositories": [
+		"./test/vscode-matlab"
+	],
+	"search.exclude": {
+		"./test/vscode-matlab/**": true
 	},
 	"material-icon-theme.folders.associations": {
 		"parser": "functions",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,19 @@
 # Changelog
 
+## 1.0.0-rc-2
+
+<a href="https://code.visualstudio.com/updates/v1_51" target="_blank"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=Compatibility&message=>=v1.51.0&logo=visualstudio&logoColor=cacde2&labelColor=333333&color=2196f3" /></a> <a href="https://gitlab.com/SNDST00M/vscode-textmate-languageservice/tree/v1.0.0-rc-2/"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=Release%20Date&message=2023-01-27&logo=googlecalendar&logoColor=cacde2&labelColor=333333&color=2196f3" /></a> <a href="https://gitlab.com/SNDST00M/vscode-textmate-languageservice/-/milestones/2"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=Milestone&message=v1.0.0-rc-2&logo=github&logoColor=cacde2&labelColor=333333&color=2196f3" /></a>
+
+- Fix the line number in the folding provider for top-level declaration folds after the first declaration.
+- Add browser production support with a cost-benefit tradeoff... we now load `onig.wasm` (Textmate grammar regex parser) [without streaming][github-monacotm-app-loadonigwasm].
+- Remove any system dependencies in the test scripts. Plus the scripts use the CLIs better & are much cleaner.
+- Migrate [previous CI workflow][github-old-ci-yaml] pipeline to Gitlab.
+
 ## 1.0.0-rc-1
 
-<a href="https://code.visualstudio.com/updates/v1_51" target="_blank"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=Compatibility&message=>=v1.51.0&logo=visualstudio&logoColor=cacde2&labelColor=333333&color=2196f3" /></a> <a href="https://gitlab.com/SNDST00M/vscode-textmate-languageservice/tree/v1.0.0-rc-1/"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=Release%20Date&message=2023-01-26&logo=googlecalendar&logoColor=cacde2&labelColor=333333&color=2196f3" /> <a href="https://gitlab.com/SNDST00M/vscode-textmate-languageservice/-/milestones/1"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=Milestone&message=v1.0.0-rc-1&logo=github&logoColor=cacde2&labelColor=333333&color=2196f3" /></a>
+<a href="https://code.visualstudio.com/updates/v1_51" target="_blank"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=Compatibility&message=>=v1.51.0&logo=visualstudio&logoColor=cacde2&labelColor=333333&color=2196f3" /></a> <a href="https://gitlab.com/SNDST00M/vscode-textmate-languageservice/tree/v1.0.0-rc-1/"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=Release%20Date&message=2023-01-26&logo=googlecalendar&logoColor=cacde2&labelColor=333333&color=2196f3" /></a> <a href="https://gitlab.com/SNDST00M/vscode-textmate-languageservice/-/milestones/1"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=Milestone&message=v1.0.0-rc-1&logo=github&logoColor=cacde2&labelColor=333333&color=2196f3" /></a>
 
-- `vscode-textmate-languageservice` codebase republished and migrated to [Gitlab][gitlab-repository].
+- `vscode-textmate-languageservice` codebase republished and migrated to [Gitlab][gitlab-repository-tag-1.0.0.rc1].
 - Significant changes to the shape of the API exports.
   - Usage: `const lsp = new LSP('languageId', context)`
   - API is now a collection of async `create*` factory functions. The names match their output interfaces in the VS Code API.
@@ -83,5 +92,10 @@ Initial version:
 - Semantic highlighting for variable assignment driven by token types and/or text.
 - Custom entry text/type getter for "Table of Contents" provider.
 
+<!-- 1.0.0-rc-2 -->
+[github-monacotm-app-loadonigwasm]: https://github.com/bolinfest/monaco-tm/blob/908f1ca0cab3e82823cb465108ae86ee2b4ba3fc/src/app.ts#L141-L143
+[github-old-ci-yaml]: https://gitlab.com/SNDST00M/vscode-textmate-languageservice/-/blob/v0.2.1/.github/workflows/ci.yml
+<!-- 1.0.0-rc-1 -->
+[gitlab-repository-tag-1.0.0.rc.1]: https://gitlab.com/SNDST00M/vscode-textmate-languageservice/-/tags/v1.0.0-rc-1
 <!-- 0.1.0 -->
-[github-vsctmls-index]: https://github.com/SNDST00M/vscode-textmate-languageservice/blob/v0.1.0/src/index.ts
+[github-vsctmls-index]: https://gitlab.com/SNDST00M/vscode-textmate-languageservice/-/blob/v0.1.0/src/index.ts
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2021 Munin M. and others
+Copyright (c) 2012-2023 Munin M. and others
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 
 Generate language service providers driven entirely by your Textmate grammar and one configuration file.
 
-<p align="center"><img src="https://gitlab.com/SNDST00M/vscode-textmate-languageservice/-/raw/v1.0.0-rc-1/assets/demo-outline.png"></p>
+<p align="center"><img src="https://gitlab.com/SNDST00M/vscode-textmate-languageservice/-/raw/v1.0.0-rc-2/assets/demo-outline.png" height="320"></p>
 
 In order to be supported by this module, the Textmate grammar must include the following features:
 - meta declaration scopes for block level declarations
@@ -18,7 +18,7 @@ In order to be supported by this module, the Textmate grammar must include the f
 
 ## Installation
 
-```console
+```bash
 npm install vscode-textmate-languageservice
 ```