From 1de72b2700c1d11abe1ebe59f5885b11d68a9a65 Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Fri, 2 Aug 2024 23:25:52 +0200 Subject: [PATCH 01/14] Wip add monaco to code hints (todo size) --- .../shared/exercise-hint-shared.module.ts | 3 +- .../shared/solution-entry.component.html | 12 ++---- .../shared/solution-entry.component.ts | 37 +++++-------------- .../monaco-editor/monaco-editor.component.ts | 10 +++++ 4 files changed, 25 insertions(+), 37 deletions(-) diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint-shared.module.ts b/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint-shared.module.ts index cc3675a9cbb4..e6f4e965ea3e 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint-shared.module.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint-shared.module.ts @@ -5,9 +5,10 @@ import { SolutionEntryComponent } from 'app/exercises/shared/exercise-hint/share import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; import { CodeHintContainerComponent } from 'app/exercises/shared/exercise-hint/shared/code-hint-container.component'; import { ArtemisMarkdownModule } from 'app/shared/markdown.module'; +import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; @NgModule({ - imports: [ArtemisSharedModule, AceEditorModule, ArtemisMarkdownModule], + imports: [ArtemisSharedModule, AceEditorModule, ArtemisMarkdownModule, MonacoEditorModule], declarations: [SolutionEntryComponent, CodeHintContainerComponent, CastToCodeHintPipe], exports: [SolutionEntryComponent, CodeHintContainerComponent, CastToCodeHintPipe], }) diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html index 6de26e13cf0e..e34783e0fc15 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html @@ -1,12 +1,6 @@
{{ solutionEntry.filePath }}
- +
+ +
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts index 5107f4ba59d1..05fb0109c006 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts @@ -1,9 +1,8 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; - -import { AceEditorComponent } from 'app/shared/markdown-editor/ace-editor/ace-editor.component'; import { faTimes } from '@fortawesome/free-solid-svg-icons'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; +import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; @Component({ selector: 'jhi-solution-entry', @@ -11,7 +10,7 @@ import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programmin }) export class SolutionEntryComponent implements OnInit { @ViewChild('editor', { static: true }) - editor: AceEditorComponent; + editor: MonacoEditorComponent; @Input() solutionEntry: ProgrammingExerciseSolutionEntry; @@ -21,7 +20,9 @@ export class SolutionEntryComponent implements OnInit { @Output() onRemoveEntry: EventEmitter = new EventEmitter(); - faTimes = faTimes; + editorHeight = 20; + + protected readonly faTimes = faTimes; constructor(protected route: ActivatedRoute) {} @@ -29,32 +30,14 @@ export class SolutionEntryComponent implements OnInit { this.setupEditor(); } - emitRemovalEvent() { - this.onRemoveEntry.emit(); - } - - onEditorContentChange(value: any) { + onEditorContentChange(value: string) { this.solutionEntry.code = value; } private setupEditor() { - const line = this.solutionEntry.line; - - this.editor.getEditor().setOptions({ - animatedScroll: true, - maxLines: Infinity, - showPrintMargin: false, - }); - // Ensure that the line counter is according to the solution entry - this.editor.getEditor().session.gutterRenderer = { - getWidth(session: any, lastLineNumber: number, config: any) { - return this.getText(session, lastLineNumber).toString().length * config.characterWidth; - }, - getText(session: any, row: number): string | number { - return !line ? '' : row + line; - }, - }; - this.editor.getEditor().getSession().setValue(this.solutionEntry.code); - this.editor.getEditor().resize(); + const startLine = this.solutionEntry.line ?? 1; + this.editor.setStartLineNumber(startLine); + this.editor.setText(this.solutionEntry.code ?? ''); + this.editor.layout(); } } diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts index b7f65e96c0dc..250543ac706f 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts +++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts @@ -364,4 +364,14 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { wordWrap: value ? 'on' : 'off', }); } + + /** + * Sets the line number from which the editor should start counting. + * @param startLineNumber The line number to start counting from (>= 1). + */ + setStartLineNumber(startLineNumber: number): void { + this._editor.updateOptions({ + lineNumbers: (number) => `${startLineNumber + number - 1}`, + }); + } } From 5e61f221469d7b8b133902bc89f08f45bcb15baf Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Fri, 2 Aug 2024 23:44:14 +0200 Subject: [PATCH 02/14] Remove unused route --- .../shared/exercise-hint/shared/solution-entry.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts index 05fb0109c006..8611ab5bccef 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts @@ -1,5 +1,4 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; import { faTimes } from '@fortawesome/free-solid-svg-icons'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; @@ -24,7 +23,7 @@ export class SolutionEntryComponent implements OnInit { protected readonly faTimes = faTimes; - constructor(protected route: ActivatedRoute) {} + constructor() {} ngOnInit() { this.setupEditor(); From 8f4b3cce550823d6c367f25da4a12526f94381b7 Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Fri, 2 Aug 2024 23:46:47 +0200 Subject: [PATCH 03/14] Add content height listener --- .../monaco-editor/monaco-editor.component.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts index 250543ac706f..c3fc3f60d887 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts +++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts @@ -96,6 +96,11 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { @Output() textChanged = new EventEmitter(); + @Output() + contentHeightChanged = new EventEmitter(); + + private contentHeightListener?: monaco.IDisposable; + private textChangedListener?: monaco.IDisposable; private textChangedEmitTimeout?: NodeJS.Timeout; ngOnInit(): void { @@ -104,10 +109,16 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { }); resizeObserver.observe(this.monacoEditorContainerElement); - this._editor.onDidChangeModelContent(() => { + this.textChangedListener = this._editor.onDidChangeModelContent(() => { this.emitTextChangeEvent(); }, this); + this.contentHeightListener = this._editor.onDidContentSizeChange((event) => { + if (event.contentHeightChanged) { + this.contentHeightChanged.emit(event.contentHeight + this._editor.getOption(monaco.editor.EditorOption.lineHeight)); + } + }); + this.themeSubscription = this.themeService.getCurrentThemeObservable().subscribe((theme) => this.changeTheme(theme)); } @@ -115,6 +126,8 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { this.reset(); this._editor.dispose(); this.themeSubscription?.unsubscribe(); + this.textChangedListener?.dispose(); + this.contentHeightListener?.dispose(); } private emitTextChangeEvent() { From 6ff34603b8fdba9b678a34c2f9b56d633399576e Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Sat, 3 Aug 2024 00:21:28 +0200 Subject: [PATCH 04/14] Adjust styling of code hint modals --- ...anual-solution-entry-creation-modal.component.html | 4 ++-- .../solution-entry-details-modal.component.html | 4 ++-- .../shared/solution-entry.component.html | 11 +++++++++-- .../exercise-hint/shared/solution-entry.component.ts | 10 ++++++++-- .../shared/monaco-editor/monaco-editor.component.ts | 4 ++++ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.html b/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.html index 8d981203bf68..9e3549414d51 100644 --- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.html +++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.html @@ -27,8 +27,8 @@

- +
+
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html index e34783e0fc15..957f199eea19 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html @@ -1,6 +1,13 @@
{{ solutionEntry.filePath }}
-
- +
+
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts index 8611ab5bccef..1eac2fbb3ad3 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts @@ -25,7 +25,7 @@ export class SolutionEntryComponent implements OnInit { constructor() {} - ngOnInit() { + ngOnInit(): void { this.setupEditor(); } @@ -33,10 +33,16 @@ export class SolutionEntryComponent implements OnInit { this.solutionEntry.code = value; } + onContentSizeChange(contentHeight: number) { + this.editorHeight = contentHeight; + } + private setupEditor() { const startLine = this.solutionEntry.line ?? 1; this.editor.setStartLineNumber(startLine); - this.editor.setText(this.solutionEntry.code ?? ''); + this.editor.changeModel(this.solutionEntry.filePath ?? 'file', this.solutionEntry.code ?? ''); this.editor.layout(); + // We manually fetch the initial content height, as the editor does not provide it immediately + this.editorHeight = this.editor.getContentHeight(); } } diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts index c3fc3f60d887..4c6cb593654f 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts +++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts @@ -163,6 +163,10 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { return this._editor.getValue(); } + getContentHeight(): number { + return this._editor.getContentHeight() + this._editor.getOption(monaco.editor.EditorOption.lineHeight); + } + setText(text: string): void { if (this.getText() !== text) { this._editor.setValue(text); From ee8a86489c15b07023472fbfb285ac15b1c45b83 Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Sat, 3 Aug 2024 00:34:09 +0200 Subject: [PATCH 05/14] Add client tests --- .../shared/solution-entry.component.spec.ts | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/test/javascript/spec/component/exercise-hint/shared/solution-entry.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/shared/solution-entry.component.spec.ts index f4ef508f827f..4b6bc884a62e 100644 --- a/src/test/javascript/spec/component/exercise-hint/shared/solution-entry.component.spec.ts +++ b/src/test/javascript/spec/component/exercise-hint/shared/solution-entry.component.spec.ts @@ -1,19 +1,20 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AceEditorComponent } from 'app/shared/markdown-editor/ace-editor/ace-editor.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockPipe } from 'ng-mocks'; +import { MockComponent, MockPipe } from 'ng-mocks'; import { SolutionEntryComponent } from 'app/exercises/shared/exercise-hint/shared/solution-entry.component'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; +import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; describe('Solution Entry Component', () => { let comp: SolutionEntryComponent; let fixture: ComponentFixture; + let solutionEntry: ProgrammingExerciseSolutionEntry; beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule], - declarations: [SolutionEntryComponent, AceEditorComponent, MockPipe(ArtemisTranslatePipe)], + declarations: [SolutionEntryComponent, MockComponent(MonacoEditorComponent), MockPipe(ArtemisTranslatePipe)], }).compileComponents(); fixture = TestBed.createComponent(SolutionEntryComponent); comp = fixture.componentInstance; @@ -23,35 +24,32 @@ describe('Solution Entry Component', () => { comp.solutionEntry.filePath = '/src/de/Test.java'; comp.solutionEntry.line = 1; comp.solutionEntry.code = 'ABC'; + + solutionEntry = comp.solutionEntry; }); afterEach(() => { jest.restoreAllMocks(); }); - it('should setup editors', () => { - jest.spyOn(comp.editor.getEditor(), 'setOptions'); - jest.spyOn(comp.editor.getEditor().getSession(), 'setValue'); - - comp.ngOnInit(); + it('should correctly setup editors', () => { + const setStartLineNumberStub = jest.spyOn(comp.editor, 'setStartLineNumber').mockImplementation(); + const changeModelStub = jest.spyOn(comp.editor, 'changeModel').mockImplementation(); + fixture.detectChanges(); - expect(comp.editor.getEditor().setOptions).toHaveBeenCalledOnce(); - expect(comp.editor.getEditor().setOptions).toHaveBeenCalledWith({ - animatedScroll: true, - maxLines: Infinity, - showPrintMargin: false, - }); - - expect(comp.editor.getEditor().getSession().setValue).toHaveBeenCalledOnce(); - expect(comp.editor.getEditor().getSession().setValue).toHaveBeenCalledWith('ABC'); + expect(setStartLineNumberStub).toHaveBeenCalledExactlyOnceWith(solutionEntry.line); + expect(changeModelStub).toHaveBeenCalledExactlyOnceWith(solutionEntry.filePath, solutionEntry.code); }); - it('should give correct line for gutter', () => { - comp.ngOnInit(); - const gutterRendererNow = comp.editor.getEditor().session.gutterRenderer; - const config = { characterWidth: 1 }; + it('should update the editor height', () => { + const contentHeight = 123; + comp.onContentSizeChange(contentHeight); + expect(comp.editorHeight).toEqual(contentHeight); + }); - expect(gutterRendererNow.getText(null, 2)).toBe(3); - expect(gutterRendererNow.getWidth(null, 2, config)).toBe(1); + it('should update the solution entry code', () => { + const newCode = 'DEF'; + comp.onEditorContentChange(newCode); + expect(comp.solutionEntry.code).toEqual(newCode); }); }); From a137847bc3d5cf835facf11edc99a6de46affd96 Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Sat, 3 Aug 2024 00:35:27 +0200 Subject: [PATCH 06/14] Improve docs --- .../webapp/app/shared/monaco-editor/monaco-editor.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts index 4c6cb593654f..e37a71e92c3b 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts +++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts @@ -384,7 +384,7 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { /** * Sets the line number from which the editor should start counting. - * @param startLineNumber The line number to start counting from (>= 1). + * @param startLineNumber The line number to start counting from (starting at 1). */ setStartLineNumber(startLineNumber: number): void { this._editor.updateOptions({ From c307997850802c3660a89da47b86f96623ce4ee5 Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Sat, 3 Aug 2024 00:39:21 +0200 Subject: [PATCH 07/14] Improve style --- .../shared/exercise-hint/shared/solution-entry.component.html | 3 +-- .../shared/exercise-hint/shared/solution-entry.component.scss | 3 +++ .../shared/exercise-hint/shared/solution-entry.component.ts | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.scss diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html index 957f199eea19..28a935fd18ff 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.html @@ -1,13 +1,12 @@
{{ solutionEntry.filePath }}
-
+
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.scss b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.scss new file mode 100644 index 000000000000..5a51c7d082f5 --- /dev/null +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.scss @@ -0,0 +1,3 @@ +.solution-entry-editor { + border: 1px solid var(--border-color); +} diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts index 1eac2fbb3ad3..aa625e9fac53 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts @@ -6,6 +6,7 @@ import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.co @Component({ selector: 'jhi-solution-entry', templateUrl: './solution-entry.component.html', + styleUrls: ['./solution-entry.component.scss'], }) export class SolutionEntryComponent implements OnInit { @ViewChild('editor', { static: true }) From c44646176a7997b64d97c288876550fe3c5a6883 Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Sat, 3 Aug 2024 00:47:07 +0200 Subject: [PATCH 08/14] Cleanup --- .../exercise-hint/shared/solution-entry.component.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts index aa625e9fac53..fe5b33e3f740 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/solution-entry.component.ts @@ -24,21 +24,19 @@ export class SolutionEntryComponent implements OnInit { protected readonly faTimes = faTimes; - constructor() {} - ngOnInit(): void { this.setupEditor(); } - onEditorContentChange(value: string) { + onEditorContentChange(value: string): void { this.solutionEntry.code = value; } - onContentSizeChange(contentHeight: number) { + onContentSizeChange(contentHeight: number): void { this.editorHeight = contentHeight; } - private setupEditor() { + private setupEditor(): void { const startLine = this.solutionEntry.line ?? 1; this.editor.setStartLineNumber(startLine); this.editor.changeModel(this.solutionEntry.filePath ?? 'file', this.solutionEntry.code ?? ''); From 32a92a1be299b3a3a86bd7202b152f0ddef5bcd7 Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Sat, 3 Aug 2024 00:48:05 +0200 Subject: [PATCH 09/14] Remove unused(?) module import --- .../shared/exercise-hint/shared/exercise-hint-shared.module.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint-shared.module.ts b/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint-shared.module.ts index e6f4e965ea3e..ef5dd4dce389 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint-shared.module.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/shared/exercise-hint-shared.module.ts @@ -2,13 +2,12 @@ import { NgModule } from '@angular/core'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { CastToCodeHintPipe } from 'app/exercises/shared/exercise-hint/services/code-hint-cast.pipe'; import { SolutionEntryComponent } from 'app/exercises/shared/exercise-hint/shared/solution-entry.component'; -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; import { CodeHintContainerComponent } from 'app/exercises/shared/exercise-hint/shared/code-hint-container.component'; import { ArtemisMarkdownModule } from 'app/shared/markdown.module'; import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; @NgModule({ - imports: [ArtemisSharedModule, AceEditorModule, ArtemisMarkdownModule, MonacoEditorModule], + imports: [ArtemisSharedModule, ArtemisMarkdownModule, MonacoEditorModule], declarations: [SolutionEntryComponent, CodeHintContainerComponent, CastToCodeHintPipe], exports: [SolutionEntryComponent, CodeHintContainerComponent, CastToCodeHintPipe], }) From dd2e62e529e97299b8f257fec24e48a705c7fe88 Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Sat, 3 Aug 2024 00:57:12 +0200 Subject: [PATCH 10/14] Add another client test --- .../monaco-editor/monaco-editor.component.spec.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts index db8013b0ee7e..d5bc6e8ae9a8 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts @@ -265,4 +265,15 @@ describe('MonacoEditorComponent', () => { expect(modelDisposeSpy).toHaveBeenCalledOnce(); expect(model.isDisposed()).toBeTrue(); }); + + it('should correctly set the start line number', () => { + fixture.detectChanges(); + comp.changeModel('file', multiLineText); + comp.setStartLineNumber(5); + // Ensure that the editor is large enough to display all lines. + comp.layoutWithFixedSize(400, 400); + const lineNumbers = fixture.debugElement.nativeElement.querySelectorAll('.line-numbers'); + expect(lineNumbers).toHaveLength(5); + expect([...lineNumbers].map((elem: HTMLElement) => elem.textContent)).toContainAllValues(['5', '6', '7', '8', '9']); + }); }); From 1e48951fbfa911e6b30795484ceb49cb9edc83df Mon Sep 17 00:00:00 2001 From: Patrik Zander Date: Sat, 3 Aug 2024 01:37:45 +0200 Subject: [PATCH 11/14] Fix manual creation snippet syntax highlighting --- ...l-solution-entry-creation-modal.component.html | 4 ++-- ...ual-solution-entry-creation-modal.component.ts | 15 ++++++++++++--- .../shared/solution-entry.component.ts | 2 +- ...olution-entry-creation-modal.component.spec.ts | 9 +++++++++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.html b/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.html index 9e3549414d51..842eb668da94 100644 --- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.html +++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.html @@ -20,7 +20,7 @@

@if (solutionRepositoryFileNames?.length) { - @for (fileName of solutionRepositoryFileNames; track fileName) { } @@ -28,7 +28,7 @@

- +