Skip to content

Commit

Permalink
Slintpad: Update monaco-editor
Browse files Browse the repository at this point in the history
hunger committed May 2, 2023
1 parent 95e00c5 commit 5c644cd
Showing 5 changed files with 22 additions and 47 deletions.
26 changes: 13 additions & 13 deletions tools/slintpad/package.json
Original file line number Diff line number Diff line change
@@ -24,23 +24,23 @@
"keywords": [],
"author": "",
"devDependencies": {
"@frsource/cypress-plugin-visual-regression-diff": "^3.2.8",
"@lumino/default-theme": "^2.0.0-beta.1",
"@lumino/dragdrop": "^2.0.0-beta.1",
"@lumino/widgets": "^2.0.0-beta.1",
"@types/vscode": "^1.74.0",
"@lumino/default-theme": "^2.1.1",
"@lumino/dragdrop": "^2.1.1",
"@lumino/widgets": "^2.1.1",
"@types/vscode": "~1.76.0",
"@typescript-eslint/eslint-plugin": "^5.49.0",
"@typescript-eslint/parser": "^5.49.0",
"cypress": "^12.4.0",
"eslint": "^8.32.0",
"monaco-editor": "0.34.1",
"monaco-languageclient": "4.0.3",
"monaco-editor": "~0.36.1",
"monaco-languageclient": "~5.0.1",
"path-browserify": "^1.0.1",
"rimraf": "^4.1.2",
"typescript": "^4.9.4",
"vite": "^4.1.1",
"rimraf": "^5.0.0",
"typescript": "^5.0.4",
"vite": "^4.3.3",
"vite-plugin-pwa": "^0.14.7",
"vscode-languageserver": "8.0.2",
"vscode-languageserver-protocol": "3.17.2"
"vscode": "npm:@codingame/monaco-vscode-api@~1.76.6",
"vscode-languageclient": "~8.1.0",
"vscode-languageserver": "~8.1.0",
"vscode-languageserver-protocol": "^3.17.3"
}
}
35 changes: 5 additions & 30 deletions tools/slintpad/src/editor_widget.ts
Original file line number Diff line number Diff line change
@@ -2,6 +2,11 @@
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial

// cSpell: ignore lumino inmemory mimetypes printerdemo
//
import "monaco-editor/esm/vs/editor/edcore.main.js";
import * as monaco from "monaco-editor/esm/vs/editor/editor.api";

import { StandaloneServices, ICodeEditorService } from "vscode/services";

import { slint_language } from "./highlighting";
import {
@@ -17,22 +22,8 @@ import * as github from "./github";
import { BoxLayout, TabBar, Title, Widget } from "@lumino/widgets";
import { Message as LuminoMessage } from "@lumino/messaging";

import "monaco-editor/esm/vs/editor/editor.all.js";
import "monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.js";
import "monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js";
import "monaco-editor/esm/vs/editor/standalone/browser/inspectTokens/inspectTokens.js";
import "monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess.js";
import "monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess.js";
import "monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess.js";
import "monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess.js";
import "monaco-editor/esm/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.js";
import * as monaco from "monaco-editor/esm/vs/editor/editor.api";

import { MonacoLanguageClient, MonacoServices } from "monaco-languageclient";

import { commands } from "vscode";
import { StandaloneServices, ICodeEditorService } from "vscode/services";

const hello_world = `import { Button, VerticalBox } from "std-widgets.slint";
export component Demo {
VerticalBox {
@@ -273,14 +264,6 @@ class EditorPaneWidget extends Widget {
return this.#editor?.getModel()?.getValue() || "";
}

get supported_actions(): string[] | undefined {
return this.#editor?.getSupportedActions().map((a) => a.id);
}

get supported_commands(): Thenable<string[]> {
return commands.getCommands();
}

get language_client(): MonacoLanguageClient | null {
return this.#client;
}
@@ -832,14 +815,6 @@ export class EditorWidget extends Widget {
return this.#editor.style;
}

get supported_actions(): string[] | undefined {
return this.#editor.supported_actions;
}

get supported_commands(): Thenable<string[]> {
return this.#editor.supported_commands;
}

async project_from_url(url: string | null) {
if (url == null) {
return;
5 changes: 2 additions & 3 deletions tools/slintpad/src/lsp.ts
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ import {
ErrorAction,
Message,
MessageTransports,
MonacoLanguageClient,
RequestMessage,
ResponseMessage,
} from "monaco-languageclient";
} from "vscode-languageclient";
import { MonacoLanguageClient } from "monaco-languageclient";

import {
BrowserMessageReader,
@@ -49,7 +49,6 @@ function createLanguageClient(
},
},
});
client.registerProgressFeatures();
return client;
}

2 changes: 1 addition & 1 deletion tools/slintpad/src/proxy.ts
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import {
Disposable,
Event,
PartialMessageInfo,
} from "monaco-languageclient";
} from "vscode-languageclient";

export class FilterProxyReader implements MessageReader {
constructor(reader: MessageReader, callback: (_: Message) => boolean) {
1 change: 1 addition & 0 deletions tools/slintpad/tsconfig.default.json
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
"@lsp/*": ["../../lsp/pkg/*"]
},
"rootDir": ".",
"skipLibCheck": true,
"strict": true,
"target": "es6",
"typeRoots": ["./node_modules/@types"]

0 comments on commit 5c644cd

Please sign in to comment.