Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development: Remove the unused Ace code editor component #8832

Merged
merged 21 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9757ef8
Remove useMonacoEditor flag
pzdr7 Jun 20, 2024
3ff761c
Remove Ace viewChild in CodeEditorComponent
pzdr7 Jun 20, 2024
44caf7c
Fix code editor container integration
pzdr7 Jun 20, 2024
6d4296e
Delete CodeEditorAce tests
pzdr7 Jun 20, 2024
f21a297
Remove references to CodeEditorAce in tests
pzdr7 Jun 20, 2024
52d5a5a
Remove CodeEditorAce from module
pzdr7 Jun 20, 2024
7305a7d
Delete CodeEditorAceComponent (except exports)
pzdr7 Jun 20, 2024
30402b8
Move Annotation declaration
pzdr7 Jun 20, 2024
4123fbf
Delete component file and styles
pzdr7 Jun 20, 2024
c12420a
Remove outdated references
pzdr7 Jun 20, 2024
cd435df
Consistency changes
pzdr7 Jun 20, 2024
0a46960
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jun 20, 2024
7941e85
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jun 20, 2024
42cbc7f
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jun 22, 2024
884529e
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jun 22, 2024
e827026
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jun 22, 2024
9dd9574
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jun 22, 2024
a9687c9
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jun 23, 2024
e138028
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jun 25, 2024
48be2ca
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jun 28, 2024
f595ae0
Merge branch 'develop' into chore/development/remove-unused-code-editor
pzdr7 Jul 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/webapp/app/entities/build-log.model.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { safeUnescape } from 'app/shared/util/security.util';
import { Annotation } from 'app/exercises/programming/shared/code-editor/ace/code-editor-ace.component';
import { Annotation } from 'app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component';
import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';

export enum BuildLogType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ <h4 class="mb-0 me-1">Online Code Editor</h4>
}
</div>
<jhi-code-editor-container
[useMonacoEditor]="true"
[editable]="!repositoryIsLocked"
[participation]="studentParticipation"
[showEditorInstructions]="showEditorInstructions"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
>
@if (!loadingParticipation && !participationCouldNotBeFetched) {
<jhi-code-editor-container
[useMonacoEditor]="true"
[editable]="false"
[participation]="participation"
[feedbackSuggestions]="feedbackSuggestions"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,8 @@ export class CodeEditorTutorAssessmentContainerComponent implements OnInit, OnDe
}

private highlightLines(firstLine: number, lastLine: number) {
this.codeEditorContainer.highlightLines(firstLine, lastLine);
// We add 1 to make the lines 1-based.
this.codeEditorContainer.highlightLines(firstLine + 1, lastLine + 1);
pzdr7 marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down Expand Up @@ -541,7 +542,7 @@ export class CodeEditorTutorAssessmentContainerComponent implements OnInit, OnDe

/**
* Remove a feedback suggestion because it was accepted or discarded.
* The actual feedback creation when accepting happens in code-editor-ace-component/unreferenced-feedback because they have full control over the suggestion cards.
* The actual feedback creation when accepting happens in code-editor-monaco-component/unreferenced-feedback because they have full control over the suggestion cards.
pzdr7 marked this conversation as resolved.
Show resolved Hide resolved
* @param feedback Feedback suggestion that is removed
*/
removeSuggestion(feedback: Feedback) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
[buildable]="selectedRepository !== REPOSITORY.TEST"
[course]="course"
[allowHiddenFiles]="true"
[useMonacoEditor]="true"
(onResizeEditorInstructions)="onResizeEditorInstructions()"
>
<div editorTitle>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
}
@if (!loadingParticipation && !participationCouldNotBeFetched) {
<jhi-code-editor-container
[useMonacoEditor]="true"
[editable]="!repositoryIsLocked"
[participation]="participation"
[showEditorInstructions]="showEditorInstructions"
Expand Down

This file was deleted.

Loading
Loading