Skip to content

Hotfix #31

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
merged 5 commits into from
Jan 16, 2025
Merged

Hotfix #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1fc490a
1.4.6
SSlinky Jan 14, 2025
f7f9c52
Merge branch 'master' into dev
SSlinky Jan 16, 2025
1e94bf1
Add textMade compile to prepublish
SSlinky Jan 16, 2025
9f925ca
Remove reference to TS as not required
SSlinky Jan 16, 2025
13c1af5
1.4.7
SSlinky Jan 16, 2025
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"icon": "images/vba-lsp-icon.png",
"author": "SSlinky",
"license": "MIT",
"version": "1.4.5",
"version": "1.4.7",
"repository": {
"type": "git",
"url": "https://github.com/SSlinky/VBA-LanguageServer"
Expand Down Expand Up @@ -118,7 +118,7 @@
]
},
"scripts": {
"vscode:prepublish": "npm run antlr4ngPre && npm run antlr4ng && npm run compile",
"vscode:prepublish": "npm run antlr4ngPre && npm run antlr4ng && npm run textMate && npm run compile",
"compile": "tsc -b",
"watch": "tsc -b -w",
"lint": "eslint ./client/src ./server/src --ext .ts,.tsx",
Expand Down
5 changes: 2 additions & 3 deletions server/src/project/elements/precompiled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Core
import * as ts from "typescript";
import { Position, Range, SemanticTokenTypes } from 'vscode-languageserver';
import { Range, SemanticTokenTypes } from 'vscode-languageserver';
import { TextDocument } from 'vscode-languageserver-textdocument';

// Antlr
Expand Down Expand Up @@ -82,7 +81,7 @@ class CompilerConditionBlock extends BaseContextSyntaxElement<CompilerConditiona
const tsExpression = this.transpileVbaToTypescript(vbaExpression);

// Evaluate the expression and return the result.
const result = eval(ts.transpile(tsExpression));
const result = eval(tsExpression);
if (!(typeof result === "boolean")) {
// TODO: Return false here instead of throwing
// and return an error diagnostic for the expression.
Expand Down
Loading