Convert editor.js to typescript (#4143)

This commit is contained in:
Markus
2022-10-18 18:19:09 +02:00
committed by GitHub
parent bc34e905d9
commit 559c8585ec
7 changed files with 1954 additions and 1842 deletions

View File

@@ -24,7 +24,7 @@
import {editor} from 'monaco-editor/';
type Decoration = {
export type Decoration = {
decoration: editor.IModelDecorationOptions;
filter: string[];
name: string;

View File

@@ -237,7 +237,7 @@ export class MultifileService {
if (file.isOpen) {
const editor = this.hub.getEditorById(file.editorId);
return editor.getSource();
return editor?.getSource() ?? '';
} else {
return file.content;
}

View File

@@ -0,0 +1,32 @@
// Copyright (c) 2022, Compiler Explorer Authors
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
export type EditorState = {
filename?: string;
options?: {
readOnly?: boolean;
};
source?: string;
lang?: string;
};

File diff suppressed because it is too large Load Diff

1914
static/panes/editor.ts Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -291,8 +291,8 @@ export class Tree {
if (file) {
file.isOpen = false;
const editor = this.hub.getEditorById(editorId);
file.langId = editor.currentLanguage.id;
file.content = editor.getSource();
file.langId = editor?.currentLanguage?.id ?? '';
file.content = editor?.getSource() ?? '';
file.editorId = -1;
}
@@ -380,7 +380,7 @@ export class Tree {
(file.isIncluded ? this.namedItems : this.unnamedItems).append(item);
}
private refresh() {
refresh() {
this.updateState();
this.namedItems.html('');
@@ -399,7 +399,7 @@ export class Tree {
this.hub.addInEditorStackIfPossible(dragConfig);
} else {
const editor = this.hub.getEditorById(file.editorId);
this.hub.activateTabForContainer(editor.container);
this.hub.activateTabForContainer(editor?.container);
}
this.sendChangesToAllEditors();

View File

@@ -257,13 +257,13 @@ export class LoadSave {
}
}
private setMinimalOptions(editorText: string, currentLanguage: Language) {
setMinimalOptions(editorText: string, currentLanguage: Language) {
this.editorText = editorText;
this.currentLanguage = currentLanguage;
this.extension = currentLanguage.extensions[0] || '.txt';
}
private onSaveToFile(fileEditor?: string) {
onSaveToFile(fileEditor?: string) {
try {
const fileLang = this.currentLanguage?.name ?? '';
const name = fileLang && fileEditor !== undefined ? fileLang + ' Editor #' + fileEditor + ' ' : '';