From 3073dfcd25351819a7c1dd498d489e0daca123ef Mon Sep 17 00:00:00 2001 From: Dave Holoway Date: Mon, 22 Jun 2020 19:56:25 +0100 Subject: [PATCH] fix assert statement checks --- langserver/java/statementtypes/AssertStatement.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/langserver/java/statementtypes/AssertStatement.js b/langserver/java/statementtypes/AssertStatement.js index 0fdf439..59fb0e0 100644 --- a/langserver/java/statementtypes/AssertStatement.js +++ b/langserver/java/statementtypes/AssertStatement.js @@ -27,8 +27,10 @@ class AssertStatement extends Statement { if (this.message) { const msg_value = this.message.resolveExpression(vi); - if (!(msg_value instanceof JavaType) || !isTypeAssignable(vi.typemap.get('java/lang/String'), msg_value)) { - vi.problems.push(ParseProblem.Error(this.message.tokens, `String expression expected`)); + if (!(msg_value instanceof JavaType)) { + vi.problems.push(ParseProblem.Error(this.message.tokens, `Expression expected`)); + } else if (msg_value === PrimitiveType.map.V) { + vi.problems.push(ParseProblem.Error(this.message.tokens, `Expression type cannot be 'void'`)); } } }