Skip to content

Move from antlr4JS to antlr4TS #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dobladez merged 2 commits into from
Dec 1, 2020
Merged

Move from antlr4JS to antlr4TS #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3550a9d
Move from antlr4js to antlr4ts
dobladez Nov 19, 2020
1dc1eb8
Pin version of lwc-services. Latest one fails
dobladez Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"printWidth": 80,
"tabWidth": 2,
"singleQuote": true
}
Comment on lines +1 to +5
Copy link
Contributor Author

@dobladez dobladez Nov 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've had a hard time rebasing this branch given the many lines modified by VSCode just due to formatting :-(.
That's why I'm adding a common .prettierrc, like we have on our SOQL extension repo.

Binary file removed Dependencies/salesforce-soql-parser-0.17.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file added Dependencies/salesforce-soql-parser-0.18.0.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/language-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"vscode-languageclient": "6.1.3",
"vscode-languageserver": "6.1.1",
"vscode-languageserver-textdocument": "1.0.1",
"@salesforce/soql-parser": "file:../../Dependencies/salesforce-soql-parser-0.17.0.tgz"
"@salesforce/soql-parser": "file:../../Dependencies/salesforce-soql-parser-0.18.0.tgz"
},
"devDependencies": {
"@babel/core": "^7.12.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/language-server/scripts/unbundle-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/salesforce-soql-parser-0.17.0.tgz';
var tarballPath = 'file:../../Dependencies/salesforce-soql-parser-0.18.0.tgz';

delete package.bundledDependencies;
package.dependencies[parser] = tarballPath;
Expand Down
6 changes: 4 additions & 2 deletions packages/language-server/src/validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ export class Validator {
diagnostics.push({
severity: DiagnosticSeverity.Error,
range: {
start: textDocument.positionAt(error.getToken()?.start as number),
end: textDocument.positionAt(error.getToken()?.stop as number),
start: textDocument.positionAt(
error.getToken()?.startIndex as number
),
end: textDocument.positionAt(error.getToken()?.stopIndex as number),
},
message: error.getMessage(),
source: 'soql',
Expand Down
2 changes: 1 addition & 1 deletion packages/soql-builder-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@salesforce/ts-types": "^1.3.0",
"@types/jest": "^26.0.6",
"eslint": "^7.5.0",
"lwc-services": "^2.2.1",
"lwc-services": "2.2.1",
"prettier": "^2.0.5",
"jest": "26.1.0"
},
Expand Down
5 changes: 2 additions & 3 deletions packages/soql-model/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
"postpublish": "./scripts/unbundle-parser.js"
},
"dependencies": {
"antlr4": "4.8.0",
"@salesforce/soql-parser": "file:../../Dependencies/salesforce-soql-parser-0.17.0.tgz"
"antlr4ts": "^0.5.0-alpha.3",
"@salesforce/soql-parser": "file:../../Dependencies/salesforce-soql-parser-0.18.0.tgz"
},
"devDependencies": {
"@types/antlr4": "4.7.2",
"@types/jest": "22.2.3",
"jest": "26.1.0",
"ts-jest": "26.1.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/soql-model/scripts/unbundle-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/salesforce-soql-parser-0.17.0.tgz';
var tarballPath = 'file:../../Dependencies/salesforce-soql-parser-0.18.0.tgz';

delete package.bundledDependencies;
package.dependencies[parser] = tarballPath;
Expand Down
Loading