luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1025 from alixander/d2oracle-move-bug

Browse source 
fix d2oracle move with duplicates
This commit is contained in:
Alexander Wang 2023-03-14 00:41:27 -07:00 committed by GitHub
commit 01fa88a97a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 314 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
d2ast/d2ast.go
View file

@ -3,23 +3,23 @@
// d2ast implements the d2 language's abstract syntax tree. // d2ast implements the d2 language's abstract syntax tree.
// //
// Special characters to think about in parser: // Special characters to think about in parser:
// # // #
// """ // """
// ; // ;
// [] // []
// {} // {}
// | // |
// $ // $
// ' // '
// " // "
// \ // \
// : // :
// . // .
// -- // --
// <> // <>
// * // *
// & // &
// () // ()
package d2ast package d2ast
import ( import (
@ -159,9 +159,9 @@ func (r Range) Before(r2 Range) bool {
// //
// note: Line and Column are zero indexed. // note: Line and Column are zero indexed.
// note: Column and Byte are UTF-8 byte indexes unless byUTF16 was passed to Position.Advance in // note: Column and Byte are UTF-8 byte indexes unless byUTF16 was passed to Position.Advance in
// which they are UTF-16 code unit indexes. // . which they are UTF-16 code unit indexes.
// If intended for Javascript consumption like in the browser or via LSP, byUTF16 is // . If intended for Javascript consumption like in the browser or via LSP, byUTF16 is
// set to true. // . set to true.
type Position struct { type Position struct {
Line int Line int
Column int Column int
@ -650,9 +650,14 @@ func (mk1 *Key) Equals(mk2 *Key) bool {
} }
if mk1.Value.Unbox() != nil { if mk1.Value.Unbox() != nil {
if mk1.Value.ScalarBox().Unbox().ScalarString() != mk2.Value.ScalarBox().Unbox().ScalarString() { if (mk1.Value.ScalarBox().Unbox() == nil) != (mk2.Value.ScalarBox().Unbox() == nil) {
return false return false
} }
if mk1.Value.ScalarBox().Unbox() != nil {
if mk1.Value.ScalarBox().Unbox().ScalarString() != mk2.Value.ScalarBox().Unbox().ScalarString() {
return false
}
}
} }
return true return true

26
d2oracle/edit_test.go
View file

@ -1858,6 +1858,32 @@ func TestMove(t *testing.T) {
assert.JSON(t, g.Objects[1].ID, "c") assert.JSON(t, g.Objects[1].ID, "c")
}, },
}, },
{
name: "duplicate",
text: `a: {
b: {
shape: cylinder
}
}
a: {
b: {
shape: cylinder
}
}
`,
key: `a.b`,
newKey: `b`,
exp: `a
a
b: {
shape: cylinder
}
`,
},
{ {
name: "rename_2", name: "rename_2",

262
testdata/d2oracle/TestMove/duplicate.exp.json generated vendored Normal file
View file

@ -0,0 +1,262 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,0:0:0-6:0:30",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,0:0:0-0:1:1",
"key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,0:0:0-0:1:1",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,2:0:3-2:1:4",
"key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,2:0:3-2:1:4",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,2:0:3-2:1:4",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:0:5-5:1:29",
"key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:0:5-3:1:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:0:5-3:1:6",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:3:8-5:0:28",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,4:2:12-4:17:27",
"key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,4:2:12-4:7:17",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,4:2:12-4:7:17",
"value": [
{
"string": "shape",
"raw_string": "shape"
}
]
}
}
]
},
"primary": {},
"value": {
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,4:9:19-4:17:27",
"value": [
{
"string": "cylinder",
"raw_string": "cylinder"
}
]
}
}
}
}
]
}
}
}
}
]
},
"root": {
"id": "",
"id_val": "",
"label_dimensions": {
"width": 0,
"height": 0
},
"attributes": {
"label": {
"value": ""
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "a",
"id_val": "a",
"label_dimensions": {
"width": 0,
"height": 0
},
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,0:0:0-0:1:1",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
},
{
"key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,2:0:3-2:1:4",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,2:0:3-2:1:4",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "a"
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
},
{
"id": "b",
"id_val": "b",
"label_dimensions": {
"width": 0,
"height": 0
},
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:0:5-3:1:6",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestMove/duplicate.d2,3:0:5-3:1:6",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "b"
},
"style": {},
"near_key": null,
"shape": {
"value": "cylinder"
},
"direction": {
"value": ""
},
"constraint": {
"value": ""
}
},
"zIndex": 0
}
]
},
"err": "<nil>"
}