Skip to content

Commit b0bdeb6

Browse files
authored
build: update package dependencies (#207)
Updated tests to match protocol changes
1 parent 2e615e8 commit b0bdeb6

File tree

6 files changed

+923
-81
lines changed

6 files changed

+923
-81
lines changed

server/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"test": "tsc -p . && jasmine dist/**/*_spec.js"
1414
},
1515
"dependencies": {
16-
"@angular/language-service": "5.0.0-beta.5",
17-
"typescript": "^2.3.4",
18-
"vscode-jsonrpc": "~3.2.0",
19-
"vscode-languageserver": "~3.2.2"
16+
"@angular/language-service": "5.1.x",
17+
"typescript": "2.5.x",
18+
"vscode-jsonrpc": "^3.2.0",
19+
"vscode-languageserver": "^3.2.2"
2020
},
2121
"devDependencies": {
22-
"@angular/compiler": "5.0.0-beta.5",
23-
"@angular/compiler-cli": "5.0.0-beta.5",
24-
"@angular/core": "5.0.0-beta.5",
22+
"@angular/compiler": "5.1.x",
23+
"@angular/compiler-cli": "5.1.x",
24+
"@angular/core": "5.1.x",
2525
"@types/jasmine": "^2.5.38",
2626
"@types/node": "^6.0.46",
2727
"jasmine": "^2.5.2",

server/src/errors.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {DiagnosticSeverity, IConnection, Range, TextDocumentIdentifier} from 'vscode-languageserver';
22
import {TextDocuments} from './documents';
3+
import {DiagnosticMessageChain} from '@angular/language-service/src/types';
34

45
export class ErrorCollector {
56
private timer: NodeJS.Timer | undefined;
@@ -41,7 +42,7 @@ export class ErrorCollector {
4142
uri: document.uri,
4243
diagnostics: diagnostics.map((diagnostic, i) => ({
4344
range: ranges[i],
44-
message: diagnostic.message,
45+
message: flattenChain(diagnostic.message, ''),
4546
severity: DiagnosticSeverity.Error,
4647
source: 'Angular'
4748
}))
@@ -50,3 +51,13 @@ export class ErrorCollector {
5051
}
5152
}
5253
}
54+
55+
function flattenChain(message: string | DiagnosticMessageChain, prefix: string) {
56+
if (typeof message === 'string') {
57+
return `${prefix}${message}`;
58+
}
59+
if (message.next) {
60+
return `${prefix}${message.message}\n${flattenChain(message.next, prefix + ' ')}`;
61+
}
62+
return `${prefix}${message.message}`
63+
}

0 commit comments

Comments
 (0)