Skip to content

Commit cc5b79b

Browse files
committed
Fix #654 disable the remaining simplifiedTypeDef caching logic in mcdoc
1 parent 1860f86 commit cc5b79b

File tree

1 file changed

+46
-1
lines changed

1 file changed

+46
-1
lines changed

patches/@spyglassmc+mcdoc+0.3.18.patch

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/node_modules/@spyglassmc/mcdoc/lib/runtime/checker/index.js b/node_modules/@spyglassmc/mcdoc/lib/runtime/checker/index.js
2-
index 2d51735..70ac4a0 100644
2+
index 2d51735..e37d8cc 100644
33
--- a/node_modules/@spyglassmc/mcdoc/lib/runtime/checker/index.js
44
+++ b/node_modules/@spyglassmc/mcdoc/lib/runtime/checker/index.js
55
@@ -545,9 +545,9 @@ function simplifyReference(typeDef, context) {
@@ -42,3 +42,48 @@ index 2d51735..70ac4a0 100644
4242
return simplifiedResult;
4343
}
4444
function simplifyDispatcher(typeDef, context) {
45+
@@ -604,23 +604,23 @@ function resolveIndices(parallelIndices, symbolMap, symbolQuery, context) {
46+
let dynamicData = false;
47+
let values = [];
48+
function pushValue(key, data) {
49+
- if (data.simplifiedTypeDef) {
50+
- if (data.simplifiedTypeDef.kind === 'union') {
51+
- values.push(...data.simplifiedTypeDef.members);
52+
- }
53+
- else {
54+
- values.push(data.simplifiedTypeDef);
55+
- }
56+
- }
57+
- else {
58+
+ // if (data.simplifiedTypeDef) {
59+
+ // if (data.simplifiedTypeDef.kind === 'union') {
60+
+ // values.push(...data.simplifiedTypeDef.members);
61+
+ // }
62+
+ // else {
63+
+ // values.push(data.simplifiedTypeDef);
64+
+ // }
65+
+ // }
66+
+ // else {
67+
const simplifiedResult = simplify(data.typeDef, context);
68+
if (simplifiedResult.dynamicData) {
69+
dynamicData = true;
70+
}
71+
else if (symbolQuery) {
72+
- symbolQuery.member(key, s => s.amend({
73+
- data: { data: { ...data, simplifiedTypeDef: simplifiedResult.typeDef } },
74+
- }));
75+
+ // symbolQuery.member(key, s => s.amend({
76+
+ // data: { data: { ...data, simplifiedTypeDef: simplifiedResult.typeDef } },
77+
+ // }));
78+
}
79+
if (simplifiedResult.typeDef.kind === 'union') {
80+
values.push(...simplifiedResult.typeDef.members);
81+
@@ -628,7 +628,7 @@ function resolveIndices(parallelIndices, symbolMap, symbolQuery, context) {
82+
else {
83+
values.push(simplifiedResult.typeDef);
84+
}
85+
- }
86+
+ // }
87+
}
88+
let unkownTypeDef = false;
89+
function getUnknownTypeDef() {

0 commit comments

Comments
 (0)