From 7b4529e8f3644107a19385dbeeb01844aafe9176 Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Sat, 5 Jul 2025 15:21:08 -0500 Subject: [PATCH] WIP lsp-manager effort --- src/app/app.component.html | 4 +- src/app/app.component.ts | 4 +- .../modals/files/files-modal.component.css | 16 ---- .../modals/files/files-modal.component.html | 52 ----------- .../modals/files/files-modal.component.ts | 85 ------------------ src/app/common/configs/keybindings.config.ts | 8 +- .../lsp-manager/lsp-manager.service.ts} | 20 ++++- .../{ => editor/lsp-manager}/webworker.ts | 0 src/app/editor/code-view/view.base.ts | 8 ++ src/app/editor/code-view/view.component.ts | 7 ++ .../lsp-manager/lsp-manager.component.css | 3 + .../lsp-manager/lsp-manager.component.html | 27 ++++++ .../lsp-manager/lsp-manager.component.ts | 87 +++++++++++++++++++ src/assets/css/styles.css | 36 +++++--- 14 files changed, 178 insertions(+), 179 deletions(-) delete mode 100644 src/app/common/components/modals/files/files-modal.component.css delete mode 100644 src/app/common/components/modals/files/files-modal.component.html delete mode 100644 src/app/common/components/modals/files/files-modal.component.ts rename src/app/common/services/{lsp.service.ts => editor/lsp-manager/lsp-manager.service.ts} (82%) rename src/app/common/services/{ => editor/lsp-manager}/webworker.ts (100%) create mode 100644 src/app/editor/lsp-manager/lsp-manager.component.css create mode 100644 src/app/editor/lsp-manager/lsp-manager.component.html create mode 100644 src/app/editor/lsp-manager/lsp-manager.component.ts diff --git a/src/app/app.component.html b/src/app/app.component.html index da2d435..34f4166 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,8 +2,8 @@ - + - + \ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 4ead8a7..7e50850 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,7 +5,7 @@ import { TabsComponent } from './editor/tabs/tabs.component'; import { EditorsComponent } from './editor/editors.component'; import { SearchReplaceComponent } from "./editor/search-replace/search-replace.component"; import { MarkdownPreviewComponent } from "./editor/markdown-preview/markdown-preview.component"; -import { FilesModalComponent } from "./common/components/modals/files/files-modal.component"; +import { LspManagerComponent } from "./editor/lsp-manager/lsp-manager.component"; @@ -17,7 +17,7 @@ import { FilesModalComponent } from "./common/components/modals/files/files-moda EditorsComponent, SearchReplaceComponent, MarkdownPreviewComponent, - FilesModalComponent + LspManagerComponent, ], templateUrl: './app.component.html', styleUrl: './app.component.css', diff --git a/src/app/common/components/modals/files/files-modal.component.css b/src/app/common/components/modals/files/files-modal.component.css deleted file mode 100644 index 0f2a2b5..0000000 --- a/src/app/common/components/modals/files/files-modal.component.css +++ /dev/null @@ -1,16 +0,0 @@ -.modal-column { - min-height: 24em; - max-height: 24em; - overflow: auto; -} - -.close-button { - background: rgba(116, 0, 0, 0.64); - border-style: solid; - border-color: rgba(0, 0, 0, 0.64); - border-width: 1px; -} - -.close-button:hover { - background: rgba(256, 0, 0, 0.64); -} \ No newline at end of file diff --git a/src/app/common/components/modals/files/files-modal.component.html b/src/app/common/components/modals/files/files-modal.component.html deleted file mode 100644 index 5fb50d2..0000000 --- a/src/app/common/components/modals/files/files-modal.component.html +++ /dev/null @@ -1,52 +0,0 @@ - \ No newline at end of file diff --git a/src/app/common/components/modals/files/files-modal.component.ts b/src/app/common/components/modals/files/files-modal.component.ts deleted file mode 100644 index 069a1c1..0000000 --- a/src/app/common/components/modals/files/files-modal.component.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { Component, inject } from "@angular/core"; -import { CommonModule } from "@angular/common"; - -import { Subject, takeUntil } from 'rxjs'; - -import * as bootstrap from "bootstrap"; - -import { FilesModalService } from "../../../services/editor/modals/files-modal.service"; -import { TabsService } from '../../../services/editor/tabs/tabs.service'; - -import { ServiceMessage } from '../../../types/service-message.type'; - - - -@Component({ - selector: 'files-modal', - standalone: true, - imports: [ - CommonModule - ], - templateUrl: './files-modal.component.html', - styleUrl: './files-modal.component.css', - host: { - 'class': '' - } -}) -export class FilesModalComponent { - private unsubscribe: Subject = new Subject(); - - private filesModalService: FilesModalService = inject(FilesModalService); - private tabsService: TabsService = inject(TabsService); - - filesModal!: bootstrap.Modal; - files: any[] = []; - - - constructor() { - } - - - private ngAfterViewInit(): void { - this.loadSubscribers(); - } - - private loadSubscribers() { - this.tabsService.getMessage$().pipe( - takeUntil(this.unsubscribe) - ).subscribe((data: ServiceMessage) => { - if (data.action === "create-tab") { - this.createFileRow(data.fileName, data.fileUUID, data.filePath); - } - }); - - this.filesModalService.showFilesModalRequested$().pipe( - takeUntil(this.unsubscribe) - ).subscribe(() => { - if (!this.filesModal) { - this.createModal(); - } - - this.showModal(); - }); - - this.filesModalService.addFileToModalRequested$().pipe( - takeUntil(this.unsubscribe) - ).subscribe((uuid: string) => { - if (!this.filesModal) { - this.createModal(); - } - }); - } - - private createModal() { - this.filesModal = new bootstrap.Modal("#filesModal", {}); - } - - public createFileRow(title: string, uuid: string, path: string): void { - this.files.push({title: title, uuid: uuid, path: path}) - } - - public showModal() { - this.filesModal?.toggle(); - } - -} \ No newline at end of file diff --git a/src/app/common/configs/keybindings.config.ts b/src/app/common/configs/keybindings.config.ts index 527da8b..6c8a513 100644 --- a/src/app/common/configs/keybindings.config.ts +++ b/src/app/common/configs/keybindings.config.ts @@ -15,18 +15,14 @@ export const Keybindings: Array<{}> = [ name: "openCommandPalette2", bindKey: {linux: "command-shift-/|F1", win: "ctrl-shift-/|F1"}, readOnly: false - }, { - name: "showFilesModal", - bindKey: {win: "ctrl-shift-b", mac: "ctrl-shift-b"}, - service: "filesModalService", - readOnly: false }, { name: "showFilesList", bindKey: {win: "ctrl-b", mac: "ctrl-b"}, readOnly: false }, { - name: "showLSPModal", + name: "lspManagerPopup", bindKey: {win: "ctrl-shift-l", mac: "ctrl-shift-l"}, + service: "", readOnly: false }, { name: "markdownPreviewPopup", diff --git a/src/app/common/services/lsp.service.ts b/src/app/common/services/editor/lsp-manager/lsp-manager.service.ts similarity index 82% rename from src/app/common/services/lsp.service.ts rename to src/app/common/services/editor/lsp-manager/lsp-manager.service.ts index 126f401..161b5a1 100644 --- a/src/app/common/services/lsp.service.ts +++ b/src/app/common/services/editor/lsp-manager/lsp-manager.service.ts @@ -1,15 +1,19 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject, ReplaySubject, Observable } from 'rxjs'; +import { ReplaySubject, Observable } from 'rxjs'; import { AceLanguageClient, LanguageClientConfig } from 'ace-linters/build/ace-language-client'; import { LanguageProvider } from "ace-linters"; +import { ServiceMessage } from '../../../types/service-message.type'; + @Injectable({ providedIn: 'root' }) -export class LSPService { +export class LspManagerService { + private messageSubject: ReplaySubject = new ReplaySubject(1); + lspConfigData!: {}; languageProviders: {} = {}; @@ -75,14 +79,22 @@ export class LSPService { return LanguageProvider.create(worker); } - protected setSessionFilePath(session: any, mode: string = "", filePath: string = "") => { + protected setSessionFilePath(session: any, mode: string = "", filePath: string = "") { if ( !session || !mode || !filePath || !this.languageProviders[mode] ) return; this.languageProviders[mode].setSessionFilePath(session, filePath); } - protected closeDocument(session: any, mode: string) => { + protected closeDocument(session: any, mode: string) { if ( !session || !mode || !this.languageProviders[mode] ) return; this.languageProviders[mode].closeDocument(session); } + public sendMessage(data: ServiceMessage): void { + this.messageSubject.next(data); + } + + public getMessage$(): Observable { + return this.messageSubject.asObservable(); + } + } \ No newline at end of file diff --git a/src/app/common/services/webworker.ts b/src/app/common/services/editor/lsp-manager/webworker.ts similarity index 100% rename from src/app/common/services/webworker.ts rename to src/app/common/services/editor/lsp-manager/webworker.ts diff --git a/src/app/editor/code-view/view.base.ts b/src/app/editor/code-view/view.base.ts index 729370c..2ff7fef 100644 --- a/src/app/editor/code-view/view.base.ts +++ b/src/app/editor/code-view/view.base.ts @@ -8,6 +8,7 @@ import { EditorsService } from '../../common/services/editor/editors.service'; import { FilesService } from '../../common/services/files.service'; import { SearchReplaceService } from '../../common/services/editor/search-replace/search-replace.service'; import { MarkdownPreviewService } from '../../common/services/editor/markdown-preview/markdown-preview.service'; +import { LspManagerService } from '../../common/services/editor/lsp-manager/lsp-manager.service'; import { EditorSettings } from "../../common/configs/editor.config"; import { NewtonFile } from '../../common/types/file.type'; @@ -31,6 +32,7 @@ export class CodeViewBase { protected filesService: FilesService = inject(FilesService); protected searchReplaceService: SearchReplaceService = inject(SearchReplaceService); protected markdownPreviewService: MarkdownPreviewService = inject(MarkdownPreviewService); + protected lspManagerService: LspManagerService = inject(LspManagerService); @ViewChild('editor') editorElm!: ElementRef; @Input() editorSettings!: typeof EditorSettings; @@ -97,6 +99,12 @@ export class CodeViewBase { this.editor.showKeyboardShortcuts(); } + public lspManagerPopup() { + let message = new ServiceMessage(); + message.action = "toggle-lsp-manager"; + this.lspManagerService.sendMessage(message); + } + public markdownPreviewPopup() { let message = new ServiceMessage(); message.action = "toggle-markdown-preview"; diff --git a/src/app/editor/code-view/view.component.ts b/src/app/editor/code-view/view.component.ts index 518f3bf..fc9b388 100644 --- a/src/app/editor/code-view/view.component.ts +++ b/src/app/editor/code-view/view.component.ts @@ -59,6 +59,12 @@ export class CodeViewComponent extends CodeViewBase { return; } + let message = new ServiceMessage(); + message.action = "register-editor"; + message.rawData = this; + + this.lspManagerService.sendMessage(message); + this.loadAceKeyBindings(); this.loadAceEventBindings(); } @@ -116,6 +122,7 @@ export class CodeViewComponent extends CodeViewBase { this.editorsService.sendMessage(message); this.searchReplaceService.sendMessage(message); + this.editorsService.sendMessage(message); message = new ServiceMessage(); message.action = "set-active-editor"; diff --git a/src/app/editor/lsp-manager/lsp-manager.component.css b/src/app/editor/lsp-manager/lsp-manager.component.css new file mode 100644 index 0000000..58463c1 --- /dev/null +++ b/src/app/editor/lsp-manager/lsp-manager.component.css @@ -0,0 +1,3 @@ +.lsp-config-text { + min-height: 25em; +} \ No newline at end of file diff --git a/src/app/editor/lsp-manager/lsp-manager.component.html b/src/app/editor/lsp-manager/lsp-manager.component.html new file mode 100644 index 0000000..1f9227a --- /dev/null +++ b/src/app/editor/lsp-manager/lsp-manager.component.html @@ -0,0 +1,27 @@ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
diff --git a/src/app/editor/lsp-manager/lsp-manager.component.ts b/src/app/editor/lsp-manager/lsp-manager.component.ts new file mode 100644 index 0000000..176e77a --- /dev/null +++ b/src/app/editor/lsp-manager/lsp-manager.component.ts @@ -0,0 +1,87 @@ +import { Component, ElementRef, HostBinding, ViewChild, inject } from '@angular/core'; +import { Subject, takeUntil } from 'rxjs'; + +import { LspManagerService } from '../../common/services/editor/lsp-manager/lsp-manager.service'; + +import { ServiceMessage } from '../../common/types/service-message.type'; + + + +@Component({ + selector: 'lsp-manager', + standalone: true, + imports: [ + ], + templateUrl: './lsp-manager.component.html', + styleUrl: './lsp-manager.component.css', + host: { + 'class': 'lsp-manager', + "(keyup)": "globalLspManagerKeyHandler($event)" + } +}) +export class LspManagerComponent { + private unsubscribe: Subject = new Subject(); + + private lspManagerService: LspManagerService = inject(LspManagerService); + + @HostBinding("class.hidden") isHidden: boolean = true; + @ViewChild('lspConfigText') lspConfigText!: ElementRef; + private editors: any = {}; + private editor: any; + + + constructor() { + } + + + private ngAfterViewInit(): void { + this.lspConfigText.nativeElement.value = this.lspManagerService.lspConfigData; + + this.loadSubscribers(); + } + + private ngOnDestroy() { + this.unsubscribe.next(); + this.unsubscribe.complete(); + } + + private loadSubscribers() { + this.lspManagerService.getMessage$().pipe( + takeUntil(this.unsubscribe) + ).subscribe((message: ServiceMessage) => { + if (message.action === "toggle-lsp-manager") { + this.toggleLspManager(message); + } else if (message.action === "set-active-editor") { + this.setActiveEditor(message); + } else if (message.action === "register-editor") { + this.registerEditor(message); + } + }); + } + + public hideLspManager() { + this.isHidden = true; + this.editor.focus(); + } + + public globalLspManagerKeyHandler(event: any) { + if (event.ctrlKey && event.shiftKey && event.key === "l") { + this.hideLspManager(); + } + } + + + private toggleLspManager(message: ServiceMessage) { + this.isHidden = !this.isHidden; + } + + private setActiveEditor(message: ServiceMessage) { + this.editor = this.editors[message.editorUUID]; + } + + private registerEditor(message: ServiceMessage) { + let _editor = message.rawData; + this.editors[_editor.uuid] = _editor.editor; + } + +} \ No newline at end of file diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css index 40d3cf1..6ad1e1a 100644 --- a/src/assets/css/styles.css +++ b/src/assets/css/styles.css @@ -6,28 +6,40 @@ /* CLASSES */ -.markdown-preview { - top: 2em; - bottom: 2em; - right: 2em; - z-index: 900; - position: fixed; +.search-replace, +.markdown-preview, +.lsp-manager { display: inline-block; - width: 50vw; - overflow: auto; + position: fixed; background-color: rgba(64, 64, 64, 0.84); + overflow: auto; } .search-replace { bottom: 2em; left: 2em; right: 2em; - z-index: 800; - display: inline-block; - position: fixed; - background-color: rgba(64, 64, 64, 0.64); + z-index: 900; } +.markdown-preview { + top: 2em; + bottom: 2em; + right: 2em; + z-index: 700; + width: 50vw; + overflow: auto; +} + +.lsp-manager { + top: 2em; + bottom: 2em; + left: 2em; + right: 2em; + z-index: 800; +} + + .info-bar { font-size: 0.8em; color: rgba(255, 255, 255, 0.84);