From 94f0c460321a9521995fec77389f045623ff0b14 Mon Sep 17 00:00:00 2001
From: Dominik Seeger <dominik.seeger@gmx.net>
Date: Fri, 22 Feb 2019 18:57:29 +0100
Subject: [PATCH] fixed incorrect syntax highlighting for block comments
Tested with the following piece of code which should hava all edge cases. Works fine :
// should not be commented out
char c = '/*';
String s = "/* some stupid stuff */";
long test(REPLACED k){ /* only this should be commented out */
if(REPLACED)
return REPLACED;
if(REPLACED)
return REPLACED;
/* this should be commented out
if(REPLACED){
if(REPLACED)
return REPLACED;
if(REPLACED)
return (REPLACED);
}
*/ this should not
return 0;
}
---
frontend/src/store/modules/submission-notes.ts | 10 ++++------
frontend/src/util/helpers.ts | 15 +++++++++++++++
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/frontend/src/store/modules/submission-notes.ts b/frontend/src/store/modules/submission-notes.ts
index 96688676..9f7286be 100644
--- a/frontend/src/store/modules/submission-notes.ts
+++ b/frontend/src/store/modules/submission-notes.ts
@@ -4,6 +4,7 @@ import * as api from '@/api'
import { Feedback, FeedbackComment, SubmissionNoType } from '@/models'
import { RootState } from '@/store/store'
import { getStoreBuilder, BareActionContext } from 'vuex-typex'
+import { syntaxPostProcess } from '@/util/helpers';
export interface SubmissionNotesState {
submission: SubmissionNoType
@@ -63,15 +64,12 @@ const submissionGetter = mb.read(function submission (state, getters) {
? getters.submissionType.programmingLanguage
: 'c'
const highlighted = hljs.highlight(language, state.submission.text || '', true).value
-
- let commentFlag = false
- return highlighted.split('\n').reduce((acc: {[k: number]: string}, cur, index) => {
- if (cur.includes("/*")) commentFlag = true
- cur = commentFlag ? '<span class="hljs-comment">' + cur + '</span>' : cur
- if (cur.includes("*/")) commentFlag = false // so that the ending line will also be greyed out
+ const postProcessed = syntaxPostProcess(highlighted);
+ const splitted = postProcessed.split('\n').reduce((acc: {[k: number]: string}, cur, index) => {
acc[index + 1] = cur
return acc
}, {})
+ return splitted;
})
const scoreGetter = mb.read(function score (state) {
return state.updatedFeedback.score !== undefined ? state.updatedFeedback.score : state.origFeedback.score
diff --git a/frontend/src/util/helpers.ts b/frontend/src/util/helpers.ts
index 07e06414..8b55485f 100644
--- a/frontend/src/util/helpers.ts
+++ b/frontend/src/util/helpers.ts
@@ -124,3 +124,18 @@ export function once (fn: Function, context?: object): OnceFunc {
wrapped.reset = function () { result = undefined }
return wrapped
}
+
+export function syntaxPostProcess (code: string): string {
+ const spanPrefix = '<span class="hljs-comment">'
+ const spanSuffix = '</span>'
+
+ code = code.replace(/(<span class="hljs-comment">)([\s\S]*?)(<\/span>)/gim, (match, p1, p2, p3) => {
+ const splitted = p2.split(/\n/)
+ for (let i = 0; i < splitted.length; i++) {
+ splitted[i] = spanPrefix + splitted[i] + spanSuffix
+ }
+
+ return splitted.join("\n")
+ })
+ return code
+}
--
GitLab