Skip to content

Commit 74633f9

Browse files
committed
fix: keeping non matching line numbers as it is
1 parent def86e1 commit 74633f9

File tree

4 files changed

+55
-5
lines changed

4 files changed

+55
-5
lines changed

helpers/utils.ts

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1-
export function urlEncode(unencoded: string): string {
2-
var encoded = globalThis.btoa(unencoded)
3-
return encoded.replace('+', '-').replace('/', '_').replace(/=+$/, '')
1+
export function urlSafeBase64Encode(decoded: string) {
2+
return decoded.replace('+', '-').replace('/', '_').replace(/=+$/, '')
43
}
54

6-
export function urlDecode(encoded: string): string {
7-
encoded = encoded.replace('-', '+').replace('_', '/')
5+
export function urlSafeBase64Decode(_encoded: string) {
6+
let encoded = _encoded.replace('-', '+').replace('_', '/')
87
while (encoded.length % 4) encoded += '='
8+
return encoded
9+
}
10+
11+
export function urlEncode(unencoded: string): string {
12+
let encoded = globalThis.btoa(unencoded)
13+
return urlSafeBase64Encode(encoded)
14+
}
15+
16+
export function urlDecode(_encoded: string): string {
17+
const encoded = urlSafeBase64Decode(_encoded)
918
return globalThis.atob(encoded)
1019
}

package-lock.json

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"core-js": "^3.15.1",
2727
"diff": "^5.0.0",
2828
"diff-match-patch": "^1.0.5",
29+
"lzutf8": "^0.6.0",
2930
"nuxt": "^2.15.7",
3031
"sass": "^1.43.4"
3132
},

pages/index.vue

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,26 @@ export default Vue.extend({
5656
}
5757
return dmp.diff_main(x, originalRhs[i])
5858
})
59+
if (originalLhs.length > originalRhs.length) {
60+
for (
61+
let i = originalLhs.length - diff.length;
62+
i < originalLhs.length;
63+
i++
64+
) {
65+
diff.push([[-1, originalLhs[i]]])
66+
}
67+
}
68+
if (originalLhs.length < originalRhs.length) {
69+
for (
70+
let i = originalRhs.length - diff.length;
71+
i < originalRhs.length;
72+
i++
73+
) {
74+
console.log(originalRhs[i])
75+
diff.push([[1, originalRhs[i]]])
76+
}
77+
}
78+
console.log(diff)
5979
this.$router.push({
6080
path: `/diff/${urlEncode(JSON.stringify(diff))}`,
6181
})

0 commit comments

Comments
 (0)