Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
99 changes: 99 additions & 0 deletions web/server/vue-cli/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions web/server/vue-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
},
"dependencies": {
"@codemirror/lang-cpp": "^6.0.3",
"@codemirror/lang-go": "^6.0.1",
"@codemirror/lang-java": "^6.0.2",
"@codemirror/lang-javascript": "^6.2.5",
"@codemirror/lang-python": "^6.2.1",
"@mdi/font": "^6.5.95",
"chart.js": "^4.0.0",
"chartjs-plugin-datalabels": "^2.0.0",
Expand Down
33 changes: 30 additions & 3 deletions web/server/vue-cli/src/components/Report/Report.vue
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ import {

import { useRoute } from "vue-router";

import { basicSetup } from "codemirror";
import {
Decoration,
EditorView,
Expand All @@ -318,8 +319,17 @@ import {
openSearchPanel,
searchKeymap
} from "@codemirror/search";
import { EditorState, StateEffect, StateField } from "@codemirror/state";
import {
Compartment,
EditorState,
StateEffect,
StateField
} from "@codemirror/state";
import { cpp } from "@codemirror/lang-cpp";
import { java } from "@codemirror/lang-java";
import { javascript } from "@codemirror/lang-javascript";
import { python } from "@codemirror/lang-python";
import { go } from "@codemirror/lang-go";

import mitt from "mitt";

Expand Down Expand Up @@ -387,6 +397,7 @@ const instance = getCurrentInstance();
const parentAppContext = instance.appContext;

const gitBlame = useGitBlame(editor, sourceFile);
const languageCompartment = new Compartment();

const vFillHeight = FillHeight;

Expand Down Expand Up @@ -551,16 +562,29 @@ class AdvancedLineWidget extends WidgetType {
}
}

function getLanguageExtension(filePath) {
const ext = (filePath || "").split(".").pop().toLowerCase();
switch (ext) {
case "py": return python();
case "java": return java();
case "js": case "jsx": case "mjs": return javascript();
case "ts": case "tsx": return javascript({ typescript: true });
case "go": return go();
default: return cpp();
}
}

onMounted(() => {
document.addEventListener("keydown", findText);

editor.value = new EditorView({
parent: editorContainer.value,
extensions: [
basicSetup,
lineNumbers(),
highlightSelectionMatches(),
EditorState.readOnly.of(true),
cpp(),
languageCompartment.of(cpp()),
keymap.of(searchKeymap),
EditorView.updateListener.of(update => {
if (update.viewportChanged) {
Expand Down Expand Up @@ -719,7 +743,10 @@ async function setSourceFileData(fileId) {
from: 0,
to: editor.value.state.doc.length,
insert: _sourceFile.fileContent,
}
},
effects: languageCompartment.reconfigure(
getLanguageExtension(_sourceFile.filePath)
)
});

if (enableBlameView.value) {
Expand Down
Loading