Skip to content

Commit 48531d4

Browse files
hediethediet
authored
Adds diff algo test (microsoft#186995)
1 parent d171766 commit 48531d4

File tree

4 files changed

+156
-0
lines changed

4 files changed

+156
-0
lines changed

‎src/vs/editor/test/node/diffing/fixtures/ws-alignment/1.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { Stack, Text } from '@fluentui/react';
2+
import { View } from '../../layout/layout';
3+
4+
export const WelcomeView = () => {
5+
return (
6+
<View title='VS Code Tools'>
7+
<Stack grow={true} verticalFill={true}>
8+
<Stack.Item>
9+
<Text>
10+
Welcome to the VS Code Tools application.
11+
</Text>
12+
</Stack.Item>
13+
</Stack>
14+
</View>
15+
);
16+
}

‎src/vs/editor/test/node/diffing/fixtures/ws-alignment/2.tsx

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { Nav } from '@fluentui/react';
2+
import { View } from '../../layout/layout';
3+
4+
export const WelcomeView = () => {
5+
return (
6+
<View title='VS Code Tools'>
7+
<Nav
8+
groups={[
9+
{
10+
links: [
11+
{ name: 'VS Code Standup (Redmond)', url: 'https://vscode-standup.azurewebsites.net', icon: 'JoinOnlineMeeting', target: '_blank' },
12+
{ name: 'VS Code Standup (Zurich)', url: 'https://stand.azurewebsites.net/', icon: 'JoinOnlineMeeting', target: '_blank' },
13+
{ name: 'VS Code Errors', url: 'https://errors.code.visualstudio.com', icon: 'ErrorBadge', target: '_blank' },
14+
]
15+
}
16+
]}>
17+
</Nav>
18+
</View>
19+
);
20+
}

‎src/vs/editor/test/node/diffing/fixtures/ws-alignment/advanced.expected.diff.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"original": {
3+
"content": "import { Stack, Text } from '@fluentui/react';\nimport { View } from '../../layout/layout';\n\nexport const WelcomeView = () => {\n\treturn (\n\t\t<View title='VS Code Tools'>\n\t\t\t<Stack grow={true} verticalFill={true}>\n\t\t\t\t<Stack.Item>\n\t\t\t\t\t<Text>\n\t\t\t\t\t\tWelcome to the VS Code Tools application.\n\t\t\t\t\t</Text>\n\t\t\t\t</Stack.Item>\n\t\t\t</Stack>\n\t\t</View>\n\t);\n}\n",
4+
"fileName": "./1.tsx"
5+
},
6+
"modified": {
7+
"content": "import { Nav } from '@fluentui/react';\nimport { View } from '../../layout/layout';\n\nexport const WelcomeView = () => {\n\treturn (\n\t\t<View title='VS Code Tools'>\n\t\t\t<Nav\n\t\t\t\tgroups={[\n\t\t\t\t\t{\n\t\t\t\t\t\tlinks: [\n\t\t\t\t\t\t\t{ name: 'VS Code Standup (Redmond)', url: 'https://vscode-standup.azurewebsites.net', icon: 'JoinOnlineMeeting', target: '_blank' },\n\t\t\t\t\t\t\t{ name: 'VS Code Standup (Zurich)', url: 'https://stand.azurewebsites.net/', icon: 'JoinOnlineMeeting', target: '_blank' },\n\t\t\t\t\t\t\t{ name: 'VS Code Errors', url: 'https://errors.code.visualstudio.com', icon: 'ErrorBadge', target: '_blank' },\n\t\t\t\t\t\t]\n\t\t\t\t\t}\n\t\t\t\t]}>\n\t\t\t</Nav>\n\t\t</View>\n\t);\n}\n",
8+
"fileName": "./2.tsx"
9+
},
10+
"diffs": [
11+
{
12+
"originalRange": "[1,2)",
13+
"modifiedRange": "[1,2)",
14+
"innerChanges": [
15+
{
16+
"originalRange": "[1,10 -> 1,21]",
17+
"modifiedRange": "[1,10 -> 1,13]"
18+
}
19+
]
20+
},
21+
{
22+
"originalRange": "[7,14)",
23+
"modifiedRange": "[7,18)",
24+
"innerChanges": [
25+
{
26+
"originalRange": "[7,5 -> 7,43]",
27+
"modifiedRange": "[7,5 -> 11,140]"
28+
},
29+
{
30+
"originalRange": "[8,5 -> 9,12]",
31+
"modifiedRange": "[12,5 -> 12,131]"
32+
},
33+
{
34+
"originalRange": "[10,7 -> 10,22]",
35+
"modifiedRange": "[13,7 -> 13,17]"
36+
},
37+
{
38+
"originalRange": "[10,30 -> 10,48]",
39+
"modifiedRange": "[13,25 -> 13,118]"
40+
},
41+
{
42+
"originalRange": "[11,6 -> 11,13]",
43+
"modifiedRange": "[14,6 -> 14,8]"
44+
},
45+
{
46+
"originalRange": "[12,5 -> 12,17]",
47+
"modifiedRange": "[15,5 -> 16,7]"
48+
},
49+
{
50+
"originalRange": "[13,6 -> 13,11]",
51+
"modifiedRange": "[17,6 -> 17,9]"
52+
}
53+
]
54+
}
55+
]
56+
}

‎src/vs/editor/test/node/diffing/fixtures/ws-alignment/legacy.expected.diff.json

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"original": {
3+
"content": "import { Stack, Text } from '@fluentui/react';\nimport { View } from '../../layout/layout';\n\nexport const WelcomeView = () => {\n\treturn (\n\t\t<View title='VS Code Tools'>\n\t\t\t<Stack grow={true} verticalFill={true}>\n\t\t\t\t<Stack.Item>\n\t\t\t\t\t<Text>\n\t\t\t\t\t\tWelcome to the VS Code Tools application.\n\t\t\t\t\t</Text>\n\t\t\t\t</Stack.Item>\n\t\t\t</Stack>\n\t\t</View>\n\t);\n}\n",
4+
"fileName": "./1.tsx"
5+
},
6+
"modified": {
7+
"content": "import { Nav } from '@fluentui/react';\nimport { View } from '../../layout/layout';\n\nexport const WelcomeView = () => {\n\treturn (\n\t\t<View title='VS Code Tools'>\n\t\t\t<Nav\n\t\t\t\tgroups={[\n\t\t\t\t\t{\n\t\t\t\t\t\tlinks: [\n\t\t\t\t\t\t\t{ name: 'VS Code Standup (Redmond)', url: 'https://vscode-standup.azurewebsites.net', icon: 'JoinOnlineMeeting', target: '_blank' },\n\t\t\t\t\t\t\t{ name: 'VS Code Standup (Zurich)', url: 'https://stand.azurewebsites.net/', icon: 'JoinOnlineMeeting', target: '_blank' },\n\t\t\t\t\t\t\t{ name: 'VS Code Errors', url: 'https://errors.code.visualstudio.com', icon: 'ErrorBadge', target: '_blank' },\n\t\t\t\t\t\t]\n\t\t\t\t\t}\n\t\t\t\t]}>\n\t\t\t</Nav>\n\t\t</View>\n\t);\n}\n",
8+
"fileName": "./2.tsx"
9+
},
10+
"diffs": [
11+
{
12+
"originalRange": "[1,2)",
13+
"modifiedRange": "[1,2)",
14+
"innerChanges": [
15+
{
16+
"originalRange": "[1,10 -> 1,21]",
17+
"modifiedRange": "[1,10 -> 1,13]"
18+
}
19+
]
20+
},
21+
{
22+
"originalRange": "[7,14)",
23+
"modifiedRange": "[7,18)",
24+
"innerChanges": [
25+
{
26+
"originalRange": "[7,5 -> 7,11]",
27+
"modifiedRange": "[7,5 -> 8,5]"
28+
},
29+
{
30+
"originalRange": "[7,14 -> 7,43]",
31+
"modifiedRange": "[8,8 -> 11,140]"
32+
},
33+
{
34+
"originalRange": "[8,5 -> 8,6]",
35+
"modifiedRange": "[12,5 -> 12,25]"
36+
},
37+
{
38+
"originalRange": "[8,9 -> 9,12]",
39+
"modifiedRange": "[12,28 -> 12,131]"
40+
},
41+
{
42+
"originalRange": "[10,7 -> 10,22]",
43+
"modifiedRange": "[13,7 -> 13,17]"
44+
},
45+
{
46+
"originalRange": "[10,30 -> 10,48]",
47+
"modifiedRange": "[13,25 -> 14,8]"
48+
},
49+
{
50+
"originalRange": "[11,6 -> 11,13]",
51+
"modifiedRange": "[15,6 -> 15,7]"
52+
},
53+
{
54+
"originalRange": "[12,5 -> 12,17]",
55+
"modifiedRange": "[16,5 -> 16,7]"
56+
},
57+
{
58+
"originalRange": "[13,6 -> 13,11]",
59+
"modifiedRange": "[17,6 -> 17,9]"
60+
}
61+
]
62+
}
63+
]
64+
}

0 commit comments

Comments
 (0)