Skip to content

Commit 8530936

Browse files
Sanjay-Fshwenzhang
authored andcommitted
bug fix ,change filed_methods to field_methods (#450)
1 parent 40c15bb commit 8530936

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tinker-build/tinker-patch-cli/tool_output/merge_mapping.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ def do_merge(self):
101101
current_data.raw_line = data.raw_line
102102
new_method_list = []
103103
# 处理方法
104-
for line in current_data.filed_methods:
104+
for line in current_data.field_methods:
105105
result, new_line = self.find_same_methods(line, data)
106106
# 只有找到才写入
107107
if result:
108108
new_method_list.append(new_line)
109-
current_data.filed_methods = new_method_list
109+
current_data.field_methods = new_method_list
110110
# 新的混淆不在旧的里面,则删除
111111
else:
112112
del self.current_classes[key]
@@ -116,7 +116,7 @@ def find_same_methods(self, line, data):
116116
# 这里是特殊情况,如果在当前mapping发现查找的这个并没有混淆,就不打算保留在mapping文件中
117117
if search_name == search_new_name:
118118
return False, ""
119-
for method_line in data.filed_methods:
119+
for method_line in data.field_methods:
120120
target_name, target_complete_name, target_new_name = self.get_name_and_complete_name_and_new_name(method_line)
121121
# 这里必须要用最完整的信息来进行比较,避免重载的影响
122122
if search_complete_name == target_complete_name:
@@ -157,7 +157,7 @@ def print_new_mapping(self):
157157
if key in self.current_classes:
158158
data = self.current_classes[key]
159159
fw.write(data.raw_line)
160-
for line in data.filed_methods:
160+
for line in data.field_methods:
161161
fw.write(line)
162162

163163

0 commit comments

Comments
 (0)