itdominator/Newton-Editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wiring of search-replace popup; moved some services up one level

Browse Source
This commit is contained in:
itdominator
2025-07-03 22:46:19 -05:00
parent 5aa6c7ca10
commit e64a18b18b
13 changed files with 457 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/editor/code-view/view.base.ts
View File

@@ -5,7 +5,8 @@ import { InfoBarService } from '../../common/services/editor/info-bar/info-bar.s
import { FilesModalService } from '../../common/services/editor/modals/files-modal.service';
import { TabsService } from '../../common/services/editor/tabs/tabs.service';
import { EditorsService } from '../../common/services/editor/editors.service';
import { FilesService } from '../../common/services/editor/files.service';
import { FilesService } from '../../common/services/files.service';
import { SearchReplaceService } from '../../common/services/editor/search-replace/search-replace.service';
import { EditorSettings } from "../../common/configs/editor.config";
import { NewtonFile } from '../../common/types/file.type';
@@ -16,17 +17,18 @@ import { ServiceMessage } from '../../common/types/service-message.type';
@Directive()
export class CodeViewBase {
public uuid: string = uuid.v4();
@Input() public isDefault: boolean = false;
@Input() public isMiniMap: boolean = false;
public uuid: string = uuid.v4();
@Input() public isDefault: boolean = false;
@Input() public isMiniMap: boolean = false;
public leftSiblingUUID!: string;
public rightSiblingUUID!: string;
protected infoBarService: InfoBarService = inject(InfoBarService);
protected filesModalService: FilesModalService = inject(FilesModalService);
protected tabsService: TabsService = inject(TabsService);
protected editorsService: EditorsService = inject(EditorsService);
protected filesService: FilesService = inject(FilesService);
protected infoBarService: InfoBarService = inject(InfoBarService);
protected filesModalService: FilesModalService = inject(FilesModalService);
protected tabsService: TabsService = inject(TabsService);
protected editorsService: EditorsService = inject(EditorsService);
protected filesService: FilesService = inject(FilesService);
protected searchReplaceService: SearchReplaceService = inject(SearchReplaceService);
@ViewChild('editor') editorElm!: ElementRef;
@Input() editorSettings!: typeof EditorSettings;
@@ -94,11 +96,19 @@ export class CodeViewBase {
}
public searchPopup() {
this.editor.execCommand("find");
let message = new ServiceMessage();
message.action = "toggle-search-replace";
this.searchReplaceService.sendMessage(message);
// this.editor.execCommand("find");
}
public replacePopup() {
this.editor.execCommand("replace");
let message = new ServiceMessage();
message.action = "toggle-search-replace";
this.searchReplaceService.sendMessage(message);
// this.editor.execCommand("replace");
}
public showFilesList() {

9
src/app/editor/code-view/view.component.ts
View File

@@ -7,10 +7,10 @@ import "ace-builds/src-noconflict/ext-keybinding_menu";
import "ace-builds/src-noconflict/ext-command_bar";
import "ace-builds/src-noconflict/ext-prompt";
import "ace-builds/src-noconflict/ext-code_lens";
import "ace-builds/src-noconflict/ext-searchbox";
// import "ace-builds/src-noconflict/ext-searchbox";
import "ace-builds/src-noconflict/ext-language_tools";
//import "ace-builds/src-noconflict/theme-one_dark";
//import "ace-builds/src-noconflict/theme-penguins_in_space";
// import "ace-builds/src-noconflict/theme-one_dark";
// import "ace-builds/src-noconflict/theme-penguins_in_space";
import "ace-builds/src-noconflict/theme-gruvbox";
import { CodeViewBase } from './view.base';
@@ -51,6 +51,7 @@ export class CodeViewComponent extends CodeViewBase {
if (this.isDefault) {
this.editorsService.setActiveEditor(this.uuid);
this.addActiveStyling();
this.editor.focus();
}
if (this.isMiniMap) {
@@ -111,8 +112,10 @@ export class CodeViewComponent extends CodeViewBase {
let message = new ServiceMessage();
message.action = "set-active-editor";
message.editorUUID = this.uuid;
message.rawData = this.editor;
this.editorsService.sendMessage(message);
this.searchReplaceService.sendMessage(message);
this.updateInfoBar();
});