development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 13:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #194610

Browse source
This commit is contained in:
Henning Dieterichs 2023-10-06 16:39:25 +02:00 committed by Henning Dieterichs
parent e702e852ea
commit 95f948717b
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
View file

@ -175,6 +175,7 @@ const enum CharBoundaryCategory {
WordNumber,
End,
Other,
Separator,
Space,
LineBreakCR,
LineBreakLF,
@ -186,6 +187,7 @@ const score: Record<CharBoundaryCategory, number> = {
[CharBoundaryCategory.WordNumber]: 0,
[CharBoundaryCategory.End]: 10,
[CharBoundaryCategory.Other]: 2,
[CharBoundaryCategory.Separator]: 3,
[CharBoundaryCategory.Space]: 3,
[CharBoundaryCategory.LineBreakCR]: 10,
[CharBoundaryCategory.LineBreakLF]: 10,
@ -210,6 +212,8 @@ function getCategory(charCode: number): CharBoundaryCategory {
return CharBoundaryCategory.WordNumber;
} else if (charCode === -1) {
return CharBoundaryCategory.End;
} else if (charCode === CharCode.Comma || charCode === CharCode.Semicolon) {
return CharBoundaryCategory.Separator;
} else {
return CharBoundaryCategory.Other;
}

8
src/vs/editor/test/node/diffing/fixtures/method-splitting/advanced.expected.diff.json
View file

@ -21,12 +21,8 @@
"modifiedRange": "[7,76 -> 7,80]"
},
{
"originalRange": "[12,153 -> 12,153]",
"modifiedRange": "[7,157 -> 7,181]"
},
{
"originalRange": "[13,1 -> 13,1]",
"modifiedRange": "[8,1 -> 9,1]"
"originalRange": "[12,153 -> 12,155 EOL]",
"modifiedRange": "[7,157 -> 8,1 EOL]"
},
{
"originalRange": "[13,31 -> 13,31]",

4
src/vs/editor/test/node/diffing/fixtures/noisy-move1/advanced.expected.diff.json
View file

@ -33,8 +33,8 @@
"modifiedRange": "[51,52 -> 51,60]"
},
{
"originalRange": "[2,162 -> 2,163]",
"modifiedRange": "[51,70 -> 51,70]"
"originalRange": "[2,163 -> 2,164]",
"modifiedRange": "[51,71 -> 51,71]"
}
]
},

4
src/vs/editor/test/node/diffing/fixtures/ts-class/advanced.expected.diff.json
View file

@ -61,8 +61,8 @@
"modifiedRange": "[14,18 -> 14,24]"
},
{
"originalRange": "[23,50 -> 23,50]",
"modifiedRange": "[14,41 -> 14,42]"
"originalRange": "[23,51 -> 23,51]",
"modifiedRange": "[14,42 -> 14,43]"
}
]
},

4
src/vs/editor/test/node/diffing/fixtures/ts-shift-to-ws/advanced.expected.diff.json
View file

@ -13,8 +13,8 @@
"modifiedRange": "[9,10)",
"innerChanges": [
{
"originalRange": "[9,115 -> 9,115]",
"modifiedRange": "[9,115 -> 9,136]"
"originalRange": "[9,119 -> 9,119]",
"modifiedRange": "[9,119 -> 9,140]"
}
]
}