Skip to content

Update to next major of diff package #2448

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 10, 2025
Merged

Update to next major of diff package #2448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 4 additions & 12 deletions src/Frontend/package-lock.json
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions src/Frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"bootstrap": "^5.3.5",
"bootstrap-icons": "^1.13.1",
"codemirror": "^6.0.1",
"diff": "^7.0.0",
"diff": "^8.0.2",
"hex-to-css-filter": "^6.0.0",
"lodash.debounce": "^4.0.8",
"lodash.throttle": "^4.0.8",
Expand All @@ -54,7 +54,6 @@
"@testing-library/vue": "^8.1.0",
"@tsconfig/node18": "^18.2.4",
"@types/bootstrap": "^5.2.10",
"@types/diff": "^7.0.2",
"@types/lodash": "^4.17.17",
"@types/node": "^22.15.29",
"@vitejs/plugin-vue": "^5.2.4",
Expand Down
24 changes: 12 additions & 12 deletions src/Frontend/src/components/messages/DiffContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { ref, computed, watch } from "vue";
import * as diff from "diff";
import { diffLines, diffWords, diffWordsWithSpace, diffChars, diffTrimmedLines, diffSentences, diffCss } from "diff";

// Types needed for the diff viewer
interface DiffChange {
Expand Down Expand Up @@ -67,7 +67,7 @@ const props = withDefaults(defineProps<Props>(), {

// Component state
const lineInformation = ref<LineInformation[]>([]);
const diffLines = ref<number[]>([]);
const diffLineIndexes = ref<number[]>([]);
const expandedBlocks = ref<number[]>([]);

// Compute diff when inputs change
Expand All @@ -92,34 +92,34 @@ const computeDiff = (): void => {
});

lineInformation.value = result;
diffLines.value = [];
diffLineIndexes.value = [];
return;
}

// Generate diff based on selected method
let diffOutput: DiffChange[];
switch (compareMethod) {
case "diffChars":
diffOutput = diff.diffChars(oldValue, newValue);
diffOutput = diffChars(oldValue, newValue);
break;
case "diffWords":
diffOutput = diff.diffWords(oldValue, newValue);
diffOutput = diffWords(oldValue, newValue);
break;
case "diffWordsWithSpace":
diffOutput = diff.diffWordsWithSpace(oldValue, newValue);
diffOutput = diffWordsWithSpace(oldValue, newValue);
break;
case "diffTrimmedLines":
diffOutput = diff.diffTrimmedLines(oldValue, newValue);
diffOutput = diffTrimmedLines(oldValue, newValue);
break;
case "diffSentences":
diffOutput = diff.diffSentences(oldValue, newValue);
diffOutput = diffSentences(oldValue, newValue);
break;
case "diffCss":
diffOutput = diff.diffCss(oldValue, newValue);
diffOutput = diffCss(oldValue, newValue);
break;
case "diffLines":
default:
diffOutput = diff.diffLines(oldValue, newValue);
diffOutput = diffLines(oldValue, newValue);
break;
}

Expand Down Expand Up @@ -170,7 +170,7 @@ const computeDiff = (): void => {
});

lineInformation.value = result;
diffLines.value = diffLinesArray;
diffLineIndexes.value = diffLinesArray;

// Reset expanded blocks when diff changes
expandedBlocks.value = [];
Expand All @@ -194,7 +194,7 @@ const renderDiff = computed<DiffItem[]>(() => {
const result: DiffItem[] = [];

// Create a mutable copy of diffLines for manipulation in the loop
const currentDiffLines = [...diffLines.value];
const currentDiffLines = [...diffLineIndexes.value];

lineInformation.value.forEach((line, i) => {
const diffBlockStart = currentDiffLines[0];
Expand Down