remove softlist of static member inheritance-arkcompiler_ets

已合并

remove softlist of static member inheritance #10556

XuMoheng创建于 4月25日从XuMoheng/arkcompiler_ets_frontend： fix_issue_9888_static_xts_1 合入到 openharmony/arkcompiler_ets_frontend： master

remove softlist of static member inheritance #10556

已合并

XuMoheng创建于 4月25日

从XuMoheng/arkcompiler_ets_frontend fix_issue_9888_static_xts_1合入到openharmony/arkcompiler_ets_frontend master

共 5 个文件变更+14-34

Mets2panda/checker/ets/object.cpp+1-2

	@@ -3238,8 +3238,7 @@ static void CheckDerivedStaticMemberAccess(ETSChecker *checker, const varbinder:
3238	return;	3238	return;
3239	}	3239	}
3240		3240
3241	- checker->LogDiagnostic(diagnostic::STATIC_PROP_INVALID_CTX_DEPRECATED, {ident->Name(), declaringType},	3241	+ checker->LogDiagnostic(diagnostic::STATIC_PROP_INHERITANCE, {ident->Name(), declaringType}, ident->Start());
		tengtengh5月8日修改涉及周边领域整改，蓝区上库前保证周边领域的XTS验证通过
3242	- ident->Start());
3243	}	3242	}
3244		3243
3245	// NOLINTNEXTLINE(readability-function-size)	3244	// NOLINTNEXTLINE(readability-function-size)

Mets2panda/test/ast/compiler/ets/class_static_member_inheritance.ets+2-2

	@@ -27,5 +27,5 @@ function main() {
27	B.foo()	27	B.foo()
28	}	28	}
29		29
30	-/* @@? 26:19 Error Semantic error ESE696291: Class static member x must be accessed with the class name A qualification only. Access using the derived class name will be deprecated soon. */	30	+/* @@? 26:19 Error Semantic error ESE854298: Class static member x must be accessed with the class name A qualification only. */
31	-/* @@? 27:7 Error Semantic error ESE696291: Class static member foo must be accessed with the class name A qualification only. Access using the derived class name will be deprecated soon. */	31	+/* @@? 27:7 Error Semantic error ESE854298: Class static member foo must be accessed with the class name A qualification only. */

Mets2panda/util/diagnostic/semantic.yaml+10-3

	@@ -347,7 +347,8 @@ semantic:
347		347
348	- name: CONFLICTING_INTERFACE_OVERRIDE_OF_SAME_SUPER_METHOD	348	- name: CONFLICTING_INTERFACE_OVERRIDE_OF_SAME_SUPER_METHOD
349	id: 602430	349	id: 602430
350	- message: "Method {}{} from class or interface {}, inherited into class or interface {}, conflicts with the previous declaration of method {}{} from class or interface {} because both declarations override method {}{} from class or interface {}"	350	+ message: "Method {}{} from class or interface {}, inherited into class or interface {}, conflicts with the previous declaration
		351	+ of method {}{} from class or interface {} because both declarations override method {}{} from class or interface {}"
351		352
352	- name: CONFLICTS_WITH_GLOBAL_IDENTIFIER	353	- name: CONFLICTS_WITH_GLOBAL_IDENTIFIER
353	id: 121810	354	id: 121810
	@@ -721,11 +722,13 @@ semantic:
721		722
722	- name: INHERITED_CLASS_TYPE_MISMATCH	723	- name: INHERITED_CLASS_TYPE_MISMATCH
723	id: 216	724	id: 216
724	- message: "Class {} cannot extend class {} because the overriding declaration type for {} {} is not compatible with the declaration type required by the base class."	725	+ message: "Class {} cannot extend class {} because the overriding declaration type for {} {} is not compatible with the declaration
		fanglou5月8日 Why is it split into two lines? XuMoheng 5月8日评论： 5月8日评论：
		726	+ type required by the base class."
725		727
726	- name: INHERITED_INTERFACE_TYPE_MISMATCH	728	- name: INHERITED_INTERFACE_TYPE_MISMATCH
727	id: 215	729	id: 215
728	- message: "Class {} cannot implement interface {} because the declaration type for {} {} is not compatible with the declaration type required by the interface."	730	+ message: "Class {} cannot implement interface {} because the declaration type for {} {} is not compatible with the declaration
		731	+ type required by the interface."
729		732
730	- name: INIT_DOESNT_COMPLETE	733	- name: INIT_DOESNT_COMPLETE
731	id: 101	734	id: 101
	@@ -1431,6 +1434,10 @@ semantic:
1431	id: 225047	1434	id: 225047
1432	message: "Static field {} cannot override base field."	1435	message: "Static field {} cannot override base field."
1433		1436
		1437	+- name: STATIC_PROP_INHERITANCE
		1438	+ id: 854298
		1439	+ message: "Class static member {} must be accessed with the class name {} qualification only."
		1440	+
1434	- name: STATIC_PROP_INVALID_CTX	1441	- name: STATIC_PROP_INVALID_CTX
1435	id: 173	1442	id: 173
1436	message: "Static property '{}' must be accessed through it's class '{}'"	1443	message: "Static property '{}' must be accessed through it's class '{}'"

Mets2panda/util/diagnostic/warning.yaml+1-7

	@@ -227,13 +227,6 @@ warning:
227	id: 19	227	id: 19
228	message: "This output option has no effect in simultaneous incremental build."	228	message: "This output option has no effect in simultaneous incremental build."
229		229
230	-
231	-- name: STATIC_PROP_INVALID_CTX_DEPRECATED
232	- id: 696291
233	- message: "Class static member {} must be accessed with the class name {} qualification only. Access using the derived class name will be deprecated soon."
234	- strict: true
235	- softlist: ["static_member_inheritance"]
236	-
237	- name: SUGGEST_FINAL_MODIFIER_FOR_CLASS	230	- name: SUGGEST_FINAL_MODIFIER_FOR_CLASS
238	id: 1	231	id: 1
239	message: "Suggest 'final' modifier for class."	232	message: "Suggest 'final' modifier for class."
	@@ -279,4 +272,5 @@ graveyard:
279	- 49710	272	- 49710
280	- 59220	273	- 59220
281	- 122948	274	- 122948
		275	+- 696291
282	# See ets_frontend/ets2panda/util/diagnostic/README.md before contributing.	276	# See ets_frontend/ets2panda/util/diagnostic/README.md before contributing.

Mets2panda/util/diagnostic/warnings-lists/softlist.yaml+0-20

	@@ -131,23 +131,3 @@ softlist:
131	- ".*/api/@ohos\\.app\\.ability\\.childProcessManager\\.d\\.ets"	131	- ".*/api/@ohos\\.app\\.ability\\.childProcessManager\\.d\\.ets"
132	- ".*/api/@ohos\\.arkui\\.dragController\\.d\\.ets"	132	- ".*/api/@ohos\\.arkui\\.dragController\\.d\\.ets"
133	- ".*/api/@ohos\\.data\\.unifiedDataChannel\\.d\\.ets"	133	- ".*/api/@ohos\\.data\\.unifiedDataChannel\\.d\\.ets"
134	-
135	-- name: "static_member_inheritance"
136	- paths:
137	- - "./arkoala-arkts/."
138	- - "./koala_projects/."
139	- - "./koala-sig/."
140	- - "./koalaui/."
141	- - "./arkui/."
142	- - "./demo/."
143	- - "./trivial/."
144	- - "./shopping/."
145	- - "./ui2abc/."
146	- - "./ui-plugins/."
147	- - "./generative_ui/."
148	- - "./a2ui_library/."
149	- - "./foundation/."
150	- - "./developtools/."
151	- - "./xts/."
152	- - "./Pre_Merge_ArkUI_Integration/."
153	- - ".*/Index\\.ets"