Merge the latest from Develop into Main

.github/ISSUE_TEMPLATE/bug-report.md

@@ -4,7 +4,6 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
 <!--
@@ -15,13 +14,12 @@ NOTICE: While GitHub is the preferred channel for reporting issues/feedback, thi
 FOR BUGS RELATED TO THE SALESFORCE CLI, please use this repository: https://github.com/forcedotcom/cli
 -->
 
-**Code Builder or Desktop**:
-
 **OS and version**:
 
 **VS Code Version**:
 
-**Browser Version (if applicable)**:
+**SFDX CLI Version**:
+
 
 ### Summary
 
@@ -43,5 +41,3 @@ _Describe what actually happened instead_.
 ### Additional information
 
 _Feel free to attach a screenshot_.
-
-**SFDX CLI Version**:

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "singleQuote": true
+}

package.json

@@ -22,6 +22,9 @@
     "tslint": "^5.8.0",
     "typescript": "^4.0.3"
   },
+  "resolutions": {
+    "**/vscode-languageserver-protocol": "3.15.3"
+  },
   "scripts": {
     "build": "lerna run build",
     "clean": "lerna run clean && rimraf yarn.lock && rimraf node_modules",

packages/language-server/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@salesforce/soql-language-server",
-  "version": "0.2.7",
+  "version": "0.3.2",
   "description": "SOQL Language Server",
   "engines": {
     "node": "*"
   },
+  "main": "lib/index.js",
   "scripts": {
     "build": "tsc --project .",
     "clean": "rimraf lib && rimraf node_modules",
@@ -16,16 +17,21 @@
     "postpublish": "./scripts/unbundle-parser.js"
   },
   "dependencies": {
-    "antlr4": "4.8.0",
+    "debounce": "^1.2.0",
+    "vscode-languageclient": "6.1.3",
+    "antlr4ts": "^0.5.0-alpha.3",
+    "antlr4-c3": "^1.1.13",
     "vscode-languageserver": "6.1.1",
+    "vscode-languageserver-protocol": "3.15.3",
     "vscode-languageserver-textdocument": "1.0.1",
-    "@salesforce/soql-parser": "file:../../Dependencies/soql-parser-0.16.0.tgz"
+    "@salesforce/soql-parser": "file:../../Dependencies/salesforce-soql-parser-0.19.0.tgz"
   },
   "devDependencies": {
     "@babel/core": "^7.12.3",
     "@babel/template": "^7.10.4",
-    "@types/antlr4": "4.7.2",
+    "@types/debounce": "^1.2.0",
     "@types/jest": "22.2.3",
+    "@types/vscode": "1.46.0",
     "jest": "26.1.0",
     "ts-jest": "26.1.3"
   },
@@ -40,4 +46,4 @@
   ],
   "author": "Salesforce",
   "license": "BSD-3-Clause"
-}
+}

packages/language-server/scripts/unbundle-parser.js

@@ -5,7 +5,7 @@ var path = require('path');
 var packagePath = '../package.json';
 var package = require(packagePath);
 var parser = '@salesforce/soql-parser';
-var tarballPath = 'file:../../Dependencies/soql-parser-0.16.0.tgz';
+var tarballPath = 'file:../../Dependencies/salesforce-soql-parser-0.19.0.tgz';
 
 delete package.bundledDependencies;
 package.dependencies[parser] = tarballPath;