Merge branch 'main' into add-aggregate-functions-snippets

Author: worksofliam

.github/workflows/ci.yaml

@@ -7,17 +7,19 @@ jobs:
     name: Release and publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
         with:
-          fetch-depth: 1
+          node-version: '16'
+      - uses: actions/checkout@v2
+      
       - run: npm install
 
-      - run: npm install -g vsce
-      - name: Create build
-        run: npm run package
-        
-      - name: Upload build
-        uses: actions/upload-artifact@v2
-        with:
-          name: vscode-db2i-release-build
-          path: ./*.vsix
+      - run: npm install -g vsce ovsx
+      
+      - name: Publish to Marketplace
+        run: vsce publish -p $PUBLISHER_TOKEN
+        env:
+          PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}
+
+      - name: Publish to Open VSX
+        run: npx ovsx publish -p ${{ secrets.OPENVSX_TOKEN }}

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 .vscode-test/
 *.vsix
-.DS_Store
+.DS_Store
+dist

.vscode/launch.json

@@ -6,21 +6,27 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "Run Extension",
-			"type": "extensionHost",
+			"name": "Launch Tests",
+			"program": "${workspaceFolder}/tests/index.js",
 			"request": "launch",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceFolder}"
-			]
+			"skipFiles": [
+				"<node_internals>/**"
+			],
+			"type": "pwa-node"
 		},
 		{
-			"name": "Extension Tests",
+			"name": "Run Extension",
 			"type": "extensionHost",
 			"request": "launch",
 			"args": [
-				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/test/suite/index"
-			]
-		}
+				"--extensionDevelopmentPath=${workspaceFolder}"
+			],
+			"outFiles": [
+				"${workspaceFolder}/dist/**/*.js"
+			],
+			"preLaunchTask": "npm: webpack",
+			"sourceMaps": true
+		},
+
 	]
 }

.vscodeignore

@@ -7,4 +7,6 @@ vsc-extension-quickstart.md
 **/jsconfig.json
 **/*.map
 **/.eslintrc.json
-media/**
+media/**
+node_modules
+src

README.md

@@ -1,6 +1,6 @@
 # vscode-db2i
 
-Db2 for IBM i tools provides SQL functionality to VS Code. It is in preview right now.
+Db2 for IBM i tools provides SQL functionality to VS Code. **It is in preview right now**.
 
 * Schemas view
 * Language tools. List tables and views and their columns when writing SQL, as well as procedures and functions