Fix parsing of the switch statement.

Author: prantlf

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.2
+
+Fix parsing of the `switch` statement.
+
 ## 0.2.1
 
 Fix the dependency on oscript-ast-walker.

package.json

@@ -2,7 +2,8 @@
   "name": "vscode-oscript",
   "displayName": "OScript Language",
   "description": "Provides syntax checking and fixing, highlighting, autocompletion, hints, symbol outline, identifier recognition and renaming and other features for the OScript language in Visual Studio Code.",
-  "version": "0.2.1",
+  "version": "0.2.2",
+  "icon": "doc/logo.png",
   "publisher": "prantlf",
   "author": {
     "name": "Ferdinand Prantl",

pkg/server/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "oscript-language-server",
   "description": "Syntax checking, highlighting, hover hints and other support for the OScript language in Visual Studio Code.",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "author": {
     "name": "Ferdinand Prantl",
     "email": "prantlf@gmail.com",
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@rollup/plugin-yaml": "3.0.0",
     "oscript-ast-walker": "0.0.1",
-    "oscript-parser": "0.2.0",
+    "oscript-parser": "0.2.1",
     "rollup-plugin-copy": "3.3.0",
     "vscode-languageserver": "7.0.0",
     "vscode-languageserver-textdocument": "1.0.1"

pkg/server/package.json

@@ -1,10 +1,8 @@
-import { nodeResolve } from '@rollup/plugin-node-resolve'
 import yaml from '@rollup/plugin-yaml'
 import copy from 'rollup-plugin-copy'
 import config from '../rollup.shared'
 
 export default config('server', [
-  nodeResolve(),
   yaml(),
   copy({
     targets: [

pkg/server/rollup.config.js

@@ -5,7 +5,8 @@ import {
   ShowMessageNotification, MessageType, WorkspaceFolder, WorkspaceFoldersChangeEvent,
   DocumentSymbolParams, SymbolInformation, DocumentSymbol, RenameParams,
   WorkspaceEdit, Range, CodeActionKind, CodeActionParams, CodeAction,
-  ReferenceParams, Location, TextDocumentIdentifier
+  ReferenceParams, Location, TextDocumentIdentifier, TextDocumentChangeEvent,
+  DidChangeWatchedFilesParams, DidChangeConfigurationParams
 } from 'vscode-languageserver/node'
 import { TextDocument } from 'vscode-languageserver-textdocument'
 import {
@@ -67,7 +68,7 @@ const documents = new TextDocuments(TextDocument)
 const pendingValidationRequests: Map<string, NodeJS.Timer> = new Map
 const validationDelay = 200
 
-connection.onInitialize((params: InitializeParams) => {
+connection.onInitialize((params: InitializeParams): InitializeResult => {
   workspaceRoot = params.rootUri
   workspaceFolders = params.workspaceFolders || []
 
@@ -117,7 +118,7 @@ connection.onInitialize((params: InitializeParams) => {
   return result
 })
 
-connection.onInitialized(() => {
+connection.onInitialized((): void => {
   if (hasConfigurationCapability) {
     connection.client.register(DidChangeConfigurationNotification.type, undefined)
   }
@@ -161,7 +162,7 @@ function updateLogLevel () {
     .then(settings => setLevel(settings.logging.level))
 }
 
-connection.onDidChangeConfiguration(event => {
+connection.onDidChangeConfiguration((event: DidChangeConfigurationParams): void => {
   logDebug('configuration changed')
   documentExtras.clear()
   if (!hasConfigurationCapability) {
@@ -208,7 +209,7 @@ async function ensureDocumentExtras(document: TextDocument): Promise<DocumentExt
   return extras
 }
 
-documents.onDidChangeContent(event => {
+documents.onDidChangeContent((event: TextDocumentChangeEvent<TextDocument>): void => {
   const { document } = event
   const { uri } = document
   logDebug('document changed - %1', uri)
@@ -217,26 +218,31 @@ documents.onDidChangeContent(event => {
   triggerValidation(document)
 })
 
+documents.onDidOpen((event: TextDocumentChangeEvent<TextDocument>): void => {
+  const { document } = event
+  logDebug('document opened - %1', document.uri)
+  triggerValidation(document)
+})
+
 function invalidateExtras(extras: DocumentExtras): void {
   extras.error = extras.ast = extras.tokens = extras.warnings = undefined
 }
 
-documents.onDidClose(event => {
+documents.onDidClose((event: TextDocumentChangeEvent<TextDocument>): void => {
   const { document } = event
   const { uri } = document
   logDebug('document closed - %1', uri)
   documentExtras.delete(uri)
   cancelValidation(document)
 })
 
-connection.onDidChangeWatchedFiles(event => {
+connection.onDidChangeWatchedFiles((event: DidChangeWatchedFilesParams): void => {
   if (wantDebug()) {
     logDebug('watched files changed - %1',
       JSON.stringify(event.changes.map(({ uri }) => uri)))
   }
   event.changes.forEach(change => {
-    const { uri } = change
-    const document = documents.get(uri)
+    const document = documents.get(change.uri)
     if (document) triggerValidation(document)
   })
 })