--- a/src/Tools/VSCode/extension/package.json Wed Feb 23 10:23:19 2022 +0100
+++ b/src/Tools/VSCode/extension/package.json Wed Feb 23 10:46:10 2022 +0100
@@ -322,14 +322,14 @@
"compile": "tsc -watch -p ./"
},
"devDependencies": {
- "@types/mocha": "^2.2.48",
- "@types/node": "^10.11.0",
- "@types/vscode": "^1.34.0",
- "mocha": "^3.5.3",
- "typescript": "^3.9.9"
+ "@types/mocha": "^9.1.0",
+ "@types/node": "^17.0.19",
+ "@types/vscode": "^1.64.0",
+ "mocha": "^9.2.1",
+ "typescript": "^4.5.5"
},
"dependencies": {
- "vscode-languageclient": "~5.2.1",
+ "vscode-languageclient": "~7.0.0",
"vscode-languageserver-types": "~3.16.0"
}
}
--- a/src/Tools/VSCode/extension/src/extension.ts Wed Feb 23 10:23:19 2022 +0100
+++ b/src/Tools/VSCode/extension/src/extension.ts Wed Feb 23 10:46:10 2022 +0100
@@ -8,7 +8,7 @@
import * as state_panel from './state_panel'
import { Uri, TextEditor, ViewColumn, Selection, Position, ExtensionContext, workspace, window,
commands, ProgressLocation } from 'vscode'
-import { LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient'
+import { LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient/node'
import { register_abbreviations } from './abbreviations'
import { Isabelle_FSP } from './isabelle_filesystem/isabelle_fsp'
import { Output_View_Provider } from './output_view'
--- a/src/Tools/VSCode/extension/src/preview_panel.ts Wed Feb 23 10:23:19 2022 +0100
+++ b/src/Tools/VSCode/extension/src/preview_panel.ts Wed Feb 23 10:46:10 2022 +0100
@@ -1,7 +1,7 @@
'use strict';
import { ExtensionContext, Uri, window, ViewColumn, WebviewPanel } from 'vscode'
-import { LanguageClient } from 'vscode-languageclient'
+import { LanguageClient } from 'vscode-languageclient/node'
import * as library from './library'
import * as protocol from './protocol'
--- a/src/Tools/VSCode/extension/src/protocol.ts Wed Feb 23 10:23:19 2022 +0100
+++ b/src/Tools/VSCode/extension/src/protocol.ts Wed Feb 23 10:46:10 2022 +0100
@@ -23,7 +23,7 @@
}
export const decoration_type =
- new NotificationType<Document_Decorations, void>("PIDE/decoration")
+ new NotificationType<Document_Decorations>("PIDE/decoration")
/* caret handling */
@@ -37,7 +37,7 @@
}
export const caret_update_type =
- new NotificationType<Caret_Update, void>("PIDE/caret_update")
+ new NotificationType<Caret_Update>("PIDE/caret_update")
/* dynamic output */
@@ -48,7 +48,7 @@
}
export const dynamic_output_type =
- new NotificationType<Dynamic_Output, void>("PIDE/dynamic_output")
+ new NotificationType<Dynamic_Output>("PIDE/dynamic_output")
/* state */
@@ -61,7 +61,7 @@
}
export const state_output_type =
- new NotificationType<State_Output, void>("PIDE/state_output")
+ new NotificationType<State_Output>("PIDE/state_output")
export interface State_Id
{
@@ -74,12 +74,12 @@
enabled: boolean
}
-export const state_init_type = new NotificationType<void, void>("PIDE/state_init")
-export const state_exit_type = new NotificationType<State_Id, void>("PIDE/state_exit")
-export const state_locate_type = new NotificationType<State_Id, void>("PIDE/state_locate")
-export const state_update_type = new NotificationType<State_Id, void>("PIDE/state_update")
+export const state_init_type = new NotificationType<void>("PIDE/state_init")
+export const state_exit_type = new NotificationType<State_Id>("PIDE/state_exit")
+export const state_locate_type = new NotificationType<State_Id>("PIDE/state_locate")
+export const state_update_type = new NotificationType<State_Id>("PIDE/state_update")
export const state_auto_update_type =
- new NotificationType<Auto_Update, void>("PIDE/state_auto_update")
+ new NotificationType<Auto_Update>("PIDE/state_auto_update")
/* preview */
@@ -99,10 +99,10 @@
}
export const preview_request_type =
- new NotificationType<Preview_Request, void>("PIDE/preview_request")
+ new NotificationType<Preview_Request>("PIDE/preview_request")
export const preview_response_type =
- new NotificationType<Preview_Response, void>("PIDE/preview_response")
+ new NotificationType<Preview_Response>("PIDE/preview_response")
/* Isabelle symbols */
@@ -113,10 +113,10 @@
}
export const symbols_type =
- new NotificationType<Symbols, void>("PIDE/symbols")
+ new NotificationType<Symbols>("PIDE/symbols")
export const symbols_request_type =
- new NotificationType<void, void>("PIDE/symbols_request")
+ new NotificationType<void>("PIDE/symbols_request")
export interface Entries<T>
{
@@ -130,24 +130,24 @@
}
export const session_theories_type =
- new NotificationType<Entries<Session_Theories>, void>("PIDE/session_theories")
+ new NotificationType<Entries<Session_Theories>>("PIDE/session_theories")
export const session_theories_request_type =
- new NotificationType<void, void>("PIDE/session_theories_request")
+ new NotificationType<void>("PIDE/session_theories_request")
/* spell checker */
export const include_word_type =
- new NotificationType<void, void>("PIDE/include_word")
+ new NotificationType<void>("PIDE/include_word")
export const include_word_permanently_type =
- new NotificationType<void, void>("PIDE/include_word_permanently")
+ new NotificationType<void>("PIDE/include_word_permanently")
export const exclude_word_type =
- new NotificationType<void, void>("PIDE/exclude_word")
+ new NotificationType<void>("PIDE/exclude_word")
export const exclude_word_permanently_type =
- new NotificationType<void, void>("PIDE/exclude_word_permanently")
+ new NotificationType<void>("PIDE/exclude_word_permanently")
export const reset_words_type =
- new NotificationType<void, void>("PIDE/reset_words")
+ new NotificationType<void>("PIDE/reset_words")
--- a/src/Tools/VSCode/extension/src/state_panel.ts Wed Feb 23 10:23:19 2022 +0100
+++ b/src/Tools/VSCode/extension/src/state_panel.ts Wed Feb 23 10:46:10 2022 +0100
@@ -2,7 +2,7 @@
import * as library from './library'
import * as protocol from './protocol'
-import {LanguageClient} from 'vscode-languageclient'
+import {LanguageClient} from 'vscode-languageclient/node'
import {ExtensionContext, Uri, ViewColumn, WebviewPanel, window} from 'vscode'
import {get_webview_html, open_webview_link} from './output_view'