Replace "alygin.vscode-tlaplus" and "alygin.vscode-tlaplus-nightly"

with "tlaplus-lang.tlaplus-lang" on Marketplace.

Part of Github issue #318
#318

[Build]

Signed-off-by: Markus Alexander Kuppe <github.com@lemmster.de>

.github/workflows/release.yml

@@ -1,18 +1,50 @@
 name: Release
 
-on: workflow_dispatch
+on:
+  push:
+    branches:
+      - 'main'
+  repository_dispatch:
+  workflow_dispatch:
 
 jobs:
+  checksecret:
+    name: check if VSCODE_MARKETPLACE_TLAPLUS_TOKEN is set in github secrets
+    runs-on: ubuntu-latest
+    outputs:
+      is_MY_SECRET_set: ${{ steps.checksecret_job.outputs.is_MY_SECRET_set }}
+    steps:
+      - name: Check secret present
+        id: checksecret_job
+        env:
+            MY_SECRET: ${{ secrets.VSCODE_MARKETPLACE_TLAPLUS_TOKEN }}
+        run: |
+            echo "is_MY_SECRET_set: ${{ env.MY_SECRET != '' }}"
+            echo "::set-output name=is_MY_SECRET_set::${{ env.MY_SECRET != '' }}"
+  
   build:
+    ## Do not run this action without the marketplace token present,
+    ## e.g., in a fork of this repo.
+    needs: [checksecret]
+    if: needs.checksecret.outputs.is_MY_SECRET_set == 'true'
     runs-on: macOS-latest
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-node@v1
       with:
         node-version: '18.19'
+    - name: Get (latest) TLC
+      run: wget https://nightly.tlapl.us/dist/tla2tools.jar -O tools/tla2tools.jar
+    - name: Get (latest) CommunityModules
+      run: wget https://github.com/tlaplus/CommunityModules/releases/latest/download/CommunityModules-deps.jar -O tools/CommunityModules-deps.jar
+    - name: Prepare Release
+      run: |
+        ## Create a git commit to use its date as the extension's version number below.
+        git add tools/*.jar -f
+        git commit -m "Latest CommunityModules and TLA+ tools"
     - name: Get current version
       id: version
-      run: echo "::set-output name=version::$(jq -r .version package.json)"
+      run: echo "::set-output name=version::$(git log -1 --format=%cd --date="format:%Y.%-m.%-d%H%M")"
     - name: Install dependencies
       run: |
         npm install
@@ -26,26 +58,5 @@ jobs:
         npm run lint
         npm test --silent
     - name: Publish to Marketplace
-      run: vsce publish --pat "${{ secrets.VSCODE_MARKETPLACE_TOKEN }}"
-    - name: Publish to Open VSX
-      run: npx ovsx publish "vscode-tlaplus-${{ steps.version.outputs.version }}.vsix" -p "${{ secrets.OPEN_VSX_TOKEN }}"
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: v${{ steps.version.outputs.version }}
-        release_name: v${{ steps.version.outputs.version }}
-        draft: false
-        prerelease: false
-    - name: Upload Release Asset
-      id: upload-release-asset 
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: vscode-tlaplus-${{ steps.version.outputs.version }}.vsix
-        asset_name: vscode-tlaplus-${{ steps.version.outputs.version }}.vsix
-        asset_content_type: application/zip
+      run: |
+        vsce publish $(git log -1 --format=%cd --date="format:%Y.%-m.%-d%H%M") --pat "${{ secrets.VSCODE_MARKETPLACE_TLAPLUS_TOKEN }}"

CONTRIBUTING.md

@@ -15,7 +15,7 @@ For those, who want to write some code, here's a short guide.
 Clone the repository:
 
 ```
-git clone https://github.com/alygin/vscode-tlaplus.git
+git clone https://github.com/tlaplus/vscode-tlaplus.git
 cd vscode-tlaplus
 ```
 
@@ -158,7 +158,7 @@ The extension consists of the following components:
 3. The implementation of the Check Result View panel that visualizes TLC output and allows to analyze it easily.
 4. The `tla2tools.jar` file from the [official TLA+ project](https://github.com/tlaplus/tlaplus). All the specification syntax verifications, PlusCal translations and TLC checks are actually performed by this Java library.
 
-The extension also requires a Java Virtual Machine (JVM) to be installed. [More information](https://github.com/alygin/vscode-tlaplus/wiki/Installing-Java).
+The extension also requires a Java Virtual Machine (JVM) to be installed. [More information](https://github.com/tlaplus/vscode-tlaplus/wiki/Installing-Java).
 
 # Project Layout
 

LICENSE

@@ -1,6 +1,8 @@
 MIT License
 
 Copyright (c) 2019 Andrew Lygin
+Copyright (c) 2020 TLA+ Foundation
+
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # TLA<sup>+</sup> for Visual Studio Code
 
-[![Build Status](https://img.shields.io/github/actions/workflow/status/tlaplus/vscode-tlaplus/ci.yml?branch=master)](https://github.com/tlaplus/vscode-tlaplus/actions?query=workflow%3ACI) [![VS Code extension version](https://img.shields.io/visual-studio-marketplace/i/alygin.vscode-tlaplus?color=blue&label=Stable%20Release&style=flat-square)](https://marketplace.visualstudio.com/items?itemName=alygin.vscode-tlaplus) [![VS Code extension version nightly](https://img.shields.io/visual-studio-marketplace/i/alygin.vscode-tlaplus-nightly?color=blue&label=Nightly%20Build&style=flat-square)](https://marketplace.visualstudio.com/items?itemName=alygin.vscode-tlaplus-nightly)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/tlaplus/vscode-tlaplus/ci.yml?branch=master)](https://github.com/tlaplus/vscode-tlaplus/actions?query=workflow%3ACI) [![VS Code extension version](https://img.shields.io/visual-studio-marketplace/i/tlaplus-lang?color=blue&label=Stable%20Release&style=flat-square)](https://marketplace.visualstudio.com/items?itemName=tlaplus-lang.tlaplus-lang)
 
 This extension adds support for the [TLA<sup>+</sup> formal specification language](http://research.microsoft.com/en-us/um/people/lamport/tla/tla.html) to VS Code. It also supports running the TLC model checker on TLA<sup>+</sup> specifications.
 
@@ -40,10 +40,10 @@ If you decide to pitch in and write some code, this document will provide you wi
 
 If you're not familiar with TLA<sup>+</sup>, but want to get a grasp on it, the following list of resources is a good starting point:
 
-* [TLA<sup>+</sup> Home Page](http://research.microsoft.com/en-us/um/people/lamport/tla/tla.html) on Leslie Lamport's website.
+* [TLA<sup>+</sup> Home Page](http://www.tlapl.us) on Leslie Lamport's website.
+* [A collection of TLA<sup>+</sup> specification examples](https://github.com/tlaplus/Examples) in the TLA<sup>+</sup> repository.
 * [Introduction to TLA<sup>+</sup> and PlusCal](https://learntla.com) by Hillel Wayne.
 * [TLA<sup>+</sup> in Practice and Theory](https://pron.github.io/posts/tlaplus_part1) by Ron Pressler.
-* [A collection of TLA<sup>+</sup> specification examples](https://github.com/tlaplus/Examples) in the TLA<sup>+</sup> repository.
 
 ## License
 

package.json

@@ -1,12 +1,12 @@
 {
-    "name": "vscode-tlaplus",
-    "displayName": "TLA+",
-    "version": "1.6.0",
+    "name": "tlaplus-lang",
+    "displayName": "TLA+ (Temporal Logic of Actions)",
+    "version": "1.7.0",
     "description": "TLA+ language support",
-    "publisher": "alygin",
+    "publisher": "tlaplus-lang",
     "license": "MIT",
     "author": {
-        "name": "Andrew Lygin"
+        "name": "TLA+ Community"
     },
     "engines": {
         "vscode": "^1.82.0"
@@ -20,10 +20,10 @@
     ],
     "repository": {
         "type": "git",
-        "url": "https://github.com/alygin/vscode-tlaplus.git"
+        "url": "https://github.com/tlaplus/vscode-tlaplus.git"
     },
     "bugs": {
-        "url": "https://github.com/alygin/vscode-tlaplus/issues"
+        "url": "https://github.com/tlaplus/vscode-tlaplus/issues"
     },
     "icon": "resources/images/tlaplus.png",
     "keywords": [
@@ -334,7 +334,7 @@
                     "type": "string",
                     "scope": "window",
                     "default": "",
-                    "markdownDescription": "Java options to use when running TLA+ tools. [How it works.](https://github.com/alygin/vscode-tlaplus/wiki/Java-Options)",
+                    "markdownDescription": "Java options to use when running TLA+ tools. [How it works.](https://github.com/tlaplus/vscode-tlaplus/wiki/Java-Options)",
                     "maxLength": 1000
                 },
                 "tlaplus.pluscal.options": {

src/commands/checkModel.ts

@@ -85,7 +85,7 @@ export async function checkModelCustom(
         return;
     }
     // Accept .tla files here because TLC configs and TLA+ modules can share the same file:
-    // https://github.com/alygin/vscode-tlaplus/issues/220
+    // https://github.com/tlaplus/vscode-tlaplus/issues/220
     const configFiles = await listFiles(path.dirname(doc.uri.fsPath),
         (fName) => fName.endsWith('.cfg') || fName.endsWith('.tla'));
     configFiles.sort();

src/debugger/debugging.ts

@@ -94,7 +94,7 @@ export async function checkAndDebugSpecCustom(
         return;
     }
     // Accept .tla files here because TLC configs and TLA+ modules can share the same file:
-    // https://github.com/alygin/vscode-tlaplus/issues/220
+    // https://github.com/tlaplus/vscode-tlaplus/issues/220
     const configFiles = await listFiles(path.dirname(targetResource.fsPath),
         (fName) => fName.endsWith('.cfg') || fName.endsWith('.tla'));
     configFiles.sort();

src/main.ts

@@ -33,7 +33,7 @@ import { ModuleSearchPathsTreeDataProvider } from './panels/moduleSearchPathsTre
 
 const TLAPLUS_FILE_SELECTOR: vscode.DocumentSelector = { scheme: 'file', language: LANG_TLAPLUS };
 const TLAPLUS_CFG_FILE_SELECTOR: vscode.DocumentSelector = { scheme: 'file', language: LANG_TLAPLUS_CFG };
-const CHANGELOG_URL = vscode.Uri.parse('https://github.com/alygin/vscode-tlaplus/blob/master/CHANGELOG.md#change-log');
+const CHANGELOG_URL = vscode.Uri.parse('https://github.com/tlaplus/vscode-tlaplus/blob/master/CHANGELOG.md#change-log');
 
 const tlaDocInfos = new TlaDocumentInfos();
 
@@ -150,7 +150,7 @@ export function activate(context: vscode.ExtensionContext): void {
             // 393ee2b2443e270bacd9f11fa219c39a88fc987d/src/extension.ts#L63-L84
             // Also see wordPattern in tlaplus-lang-config.json that drops "@"
             // and "'" compared to VSCode's standard wordPattern.
-            // https://github.com/alygin/vscode-tlaplus/issues/200
+            // https://github.com/tlaplus/vscode-tlaplus/issues/200
                 provideEvaluatableExpression(document: vscode.TextDocument, position: vscode.Position):
                     vscode.ProviderResult<vscode.EvaluatableExpression> {
                     const wordRange = document.getWordRangeAtPosition(position);

src/tla2tools.ts

@@ -10,7 +10,7 @@ import { ToolOutputChannel } from './outputChannels';
 import { JavaVersionParser } from './parsers/javaVersion';
 
 // CFG_EXTENSION can be used to fetch all the settings for this extension
-const CFG_EXTENSION = '@ext:alygin.vscode-tlaplus';
+const CFG_EXTENSION = '@ext:tlaplus-lang.tlaplus-lang';
 
 const CFG_JAVA_HOME = 'tlaplus.java.home';
 const CFG_JAVA_OPTIONS = 'tlaplus.java.options';

tests/suite/parsers/tlc.test.ts

@@ -405,7 +405,7 @@ suite('TLC Output Parser Test Suite', () => {
     });
 
     test('Handles no-line-break message switch', () => {
-        // https://github.com/alygin/vscode-tlaplus/issues/47
+        // https://github.com/tlaplus/vscode-tlaplus/issues/47
         return assertOutput('no-line-break-switch.out', TEST_SPEC_FILES,
             new CheckResultBuilder('no-line-break-switch.out', CheckState.Success, CheckStatus.Finished)
                 .addDColFilePath('/Users/bob/example.tla')