diff --git a/package.json b/package.json index 09d91700..eb8c4ad3 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ } }, "dependencies": { - "dt-sql-parser": "4.0.0-beta.4.9" + "dt-sql-parser": "4.0.0-beta.4.11" }, "peerDependencies": { "monaco-editor": ">=0.31.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 566bd459..0d193dda 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,7 +3,7 @@ lockfileVersion: 5.3 specifiers: '@types/mocha': ^9.1.0 '@types/node': ^20.4.0 - dt-sql-parser: 4.0.0-beta.4.9 + dt-sql-parser: 4.0.0-beta.4.11 eslint: ^7.1.0 eslint-config-google: ^0.14.0 eslint-config-prettier: ^6.15.0 @@ -24,7 +24,7 @@ specifiers: typescript: ^5.0.4 dependencies: - dt-sql-parser: 4.0.0-beta.4.9 + dt-sql-parser: 4.0.0-beta.4.11 devDependencies: '@types/mocha': 9.1.1 @@ -988,8 +988,8 @@ packages: minimatch: 3.1.2 dev: true - /dt-sql-parser/4.0.0-beta.4.9: - resolution: {integrity: sha512-c0mStI57Hq+15XRKuwZ7YZ+4C3Z+mO+nJ/wdws6PndBTjVF55mlbHVbRuBGDjlCFSpeN+VqEY/d2VZC4q1oMpQ==} + /dt-sql-parser/4.0.0-beta.4.11: + resolution: {integrity: sha512-bgMJAMImikNwE0OPZApI+R+PjpI8xoJAksQIUJdtS4+piZII1LHzbmlp8T7iRJ4Fo56EwY5ILmv9VcZ/PwKV1A==} dependencies: antlr4-c3: 3.1.1 antlr4ts: 0.5.0-alpha.4 diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index aa3e199f..fc95604f 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -113,29 +113,23 @@ export class DiagnosticsAdapter { } } -function toSeverity(lsSeverity: number): MarkerSeverity { +function toSeverity(lsSeverity?: number): MarkerSeverity { switch (lsSeverity) { default: return MarkerSeverity.Error; } } -/** - * TODO: diag is actually a type ParseError - * @see {@link ParseError} - */ -function toDiagnostics(resource: Uri, diag: any): editor.IMarkerData { - let code = typeof diag.code === 'number' ? String(diag.code) : diag.code; - +function toDiagnostics(resource: Uri, diag: ParseError): editor.IMarkerData { return { - severity: toSeverity(diag.severity), + severity: toSeverity(), startLineNumber: diag.startLine, - startColumn: diag.startCol + 1, + startColumn: diag.startColumn, endLineNumber: diag.endLine, - endColumn: diag.endCol + 1, + endColumn: diag.endColumn, message: diag.message, - code: code, - source: diag.source + code: undefined, // TODO: set error type + source: 'dt-sql-parser' }; } diff --git a/yarn.lock b/yarn.lock index bf80aed2..ec14d480 100644 --- a/yarn.lock +++ b/yarn.lock @@ -985,10 +985,10 @@ dotgitignore@^2.1.0: find-up "^3.0.0" minimatch "^3.0.4" -dt-sql-parser@4.0.0-beta.4.9: - version "4.0.0-beta.4.9" - resolved "https://registry.npmmirror.com/dt-sql-parser/-/dt-sql-parser-4.0.0-beta.4.9.tgz#0f2fc382829f6ad9bbbd7d8ac6a6ceb33336f466" - integrity sha512-c0mStI57Hq+15XRKuwZ7YZ+4C3Z+mO+nJ/wdws6PndBTjVF55mlbHVbRuBGDjlCFSpeN+VqEY/d2VZC4q1oMpQ== +dt-sql-parser@4.0.0-beta.4.11: + version "4.0.0-beta.4.11" + resolved "https://registry.npmmirror.com/dt-sql-parser/-/dt-sql-parser-4.0.0-beta.4.11.tgz#2119847717f3ec6a462a418425db1b92e8a5f1a8" + integrity sha512-bgMJAMImikNwE0OPZApI+R+PjpI8xoJAksQIUJdtS4+piZII1LHzbmlp8T7iRJ4Fo56EwY5ILmv9VcZ/PwKV1A== dependencies: antlr4-c3 "3.1.1" antlr4ts "0.5.0-alpha.4"