From 3bd6c64ab3b8de71735573b32bf26e5fcf019f26 Mon Sep 17 00:00:00 2001
From: Relentless <relentless@rlnt.dev>
Date: Fri, 29 Jul 2022 19:11:50 +0200
Subject: [PATCH] fix workflow issues

---
 .eslintrc                     | 2 +-
 .github/workflows/release.yml | 4 ++--
 .prettierrc                   | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index d47b1b2..bdff502 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -8,7 +8,6 @@
   "extends": [
     "eslint:recommended",
     "plugin:jsdoc/recommended",
-    "plugin:import/typescript",
     "plugin:regexp/recommended",
     "plugin:@typescript-eslint/recommended",
     "prettier"
@@ -17,6 +16,7 @@
   "rules": {
     "prefer-const": "warn",
     "no-empty-function": "warn",
+    "jsdoc/require-jsdoc": "off",
     "@typescript-eslint/ban-types": "warn",
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/explicit-member-accessibility": ["warn", { "accessibility": "explicit" }],
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fb1aef1..3dad17b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
             declare -g $1="$2"
           }
           set_var VSIX_FILE $(eval echo keep-a-changelog-*.vsix)
-          set_var VERSION $(echo ${VSIX_FILE%.*} | cut -d- -f2)
+          set_var VERSION $(echo ${VSIX_FILE%.*} | cut -d- -f4)
 
       - name: Install changelog parser
         uses: taiki-e/install-action@parse-changelog
@@ -53,6 +53,6 @@ jobs:
           files: ${{ env.VSIX_FILE }}
 
       - name: Publish
-        run: yarn release
+        run: yarn publish
         env:
           VSCE_PAT: ${{ secrets.VSCE_PAT }}
diff --git a/.prettierrc b/.prettierrc
index 6138e3a..d0228df 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -2,10 +2,7 @@
   "arrowParens": "avoid",
   "bracketSpacing": true,
   "endOfLine": "lf",
-  "htmlWhitespaceSensitivity": "css",
   "insertPragma": false,
-  "jsxBracketSameLine": false,
-  "jsxSingleQuote": false,
   "printWidth": 120,
   "proseWrap": "preserve",
   "quoteProps": "as-needed",
@@ -15,9 +12,13 @@
   "tabWidth": 4,
   "trailingComma": "none",
   "useTabs": false,
+  "jsdocDescriptionWithDot": true,
+  "jsdocVerticalAlignment": true,
+  "jsdocPrintWidth": 80,
+  "plugins": ["./node_modules/prettier-plugin-packagejson", "./node_modules/prettier-plugin-jsdoc"],
   "overrides": [
     {
-      "files": "*.{json,yml,yaml,editorconfig,prettierrc,eslintrc}",
+      "files": "*.{json,yml,yaml,prettierrc,eslintrc}",
       "options": {
         "tabWidth": 2
       }