fix linting of meta trait methods

hpi-swa-teaching · Dec 22, 2024 · 136723f · 136723f
1 parent 3b379c2
commit 136723f
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 18 deletions.
diff --git a/packages/SwaLint-Core.package/SLClassTestObject.class/instance/fetchClassMethods.st b/packages/SwaLint-Core.package/SLClassTestObject.class/instance/fetchClassMethods.st
@@ -3,7 +3,7 @@ fetchClassMethods
 
 	classMethods := (self 
 		collect: SLMethodTestObject 
-		from: self testObject class methodDict values)
+		from: self testObject theMetaClass methodDict values)
 		reject: [:method | self rejectMethod: method].
 	classMethods do: [:each | each classSide: true].
 	^ classMethods
diff --git a/packages/SwaLint-Core.package/SLClassTestObject.class/instance/fetchClassVariables.st b/packages/SwaLint-Core.package/SLClassTestObject.class/instance/fetchClassVariables.st
@@ -7,6 +7,6 @@ fetchClassVariables
 	classVariables do: [:each | each isClassVariable: true].
 	classVariables addAll: (self 
 		collect: SLVariableTestObject 
-		from: self testObject class instVarNames).
+		from: self testObject theMetaClass instVarNames).
 	classVariables do: [:each | each classSide: true].
 	^ classVariables
diff --git a/packages/SwaLint-Core.package/SLClassTestObject.class/instance/fetchSuperClassMethods.st b/packages/SwaLint-Core.package/SLClassTestObject.class/instance/fetchSuperClassMethods.st
@@ -3,7 +3,7 @@ fetchSuperClassMethods
 
 	superClassMethods := (self 
 		collect: SLMethodTestObject 
-		from: self testObject superclass class methodDict values)
+		from: self testObject superclass theMetaClass methodDict values)
 		reject: [:method | self rejectMethod: method].
 	superClassMethods do: [:each | each classSide: true].
 	^ superClassMethods
diff --git a/packages/SwaLint-Core.package/SLClassTestObject.class/instance/fetchSuperClassVariables.st b/packages/SwaLint-Core.package/SLClassTestObject.class/instance/fetchSuperClassVariables.st
@@ -3,8 +3,10 @@ fetchSuperClassVariables
 
 	superClassVariables := self 
 		collect: SLVariableTestObject 
-		from: self testObject class superclass allInstVarNames. 	
-	superClassVariables addAll: (self 
+		from: self testObject superclass allClassVarNames.
+	classVariables do: [:each | each isClassVariable: true].
+	classVariables addAll: (self
 		collect: SLVariableTestObject 
-		from: self testObject superclass allClassVarNames).
+		from: self testObject theMetaClass superclass allInstVarNames).
+	classVariables do: [:each | each classSide: true].
 	^ superClassVariables
diff --git a/packages/SwaLint-Core.package/SLClassTestObject.class/methodProperties.json b/packages/SwaLint-Core.package/SLClassTestObject.class/methodProperties.json
@@ -19,12 +19,12 @@
 		"classVariables" : "AT 5/7/2008 21:34",
 		"classVariables:" : "MB 6/17/2014 12:22",
 		"fetchAllVariables" : "MB 6/17/2014 12:51",
-		"fetchClassMethods" : "tfel 7/25/2011 15:14:47.818",
-		"fetchClassVariables" : "ct 12/20/2024 02:04",
+		"fetchClassMethods" : "ct 12/22/2024 01:45",
+		"fetchClassVariables" : "ct 12/22/2024 01:47",
 		"fetchInstanceMethods" : "tfel 7/25/2011 15:14:09.188",
 		"fetchInstanceVariables" : "AT 5/28/2008 13:29",
-		"fetchSuperClassMethods" : "NA 7/26/2015 18:31",
-		"fetchSuperClassVariables" : "MB 6/17/2014 12:51",
+		"fetchSuperClassMethods" : "ct 12/22/2024 01:51",
+		"fetchSuperClassVariables" : "ct 12/22/2024 01:59",
 		"fetchSuperInstanceMethods" : "NA 7/26/2015 18:32",
 		"fetchSuperInstanceVariables" : "MB 6/17/2014 12:51",
 		"fetchSuperMethods" : "NA 7/26/2015 19:11",

diff --git a/...waLint-Core.package/SLResultDialog.class/instance/addClassSummaryResult.toMessageList..st b/...waLint-Core.package/SLResultDialog.class/instance/addClassSummaryResult.toMessageList..st
@@ -13,7 +13,7 @@ addClassSummaryResult: aSLSummaryResult toMessageList: aSet
 	aSLSummaryResult testObject classMethods do: [ :method |
 		aSLSummaryResult selectForSummary: method ifTrue: [
 			aSet add: (MethodReference 				
-				class: class class
+				class: class theMetaClass
 				selector: method methodSelector)]].
 
 	(aSLSummaryResult testObject variables anySatisfy: [ :variable |

diff --git a/...ges/SwaLint-Core.package/SLResultDialog.class/instance/addSummaryResult.toEnvironment..st b/...ges/SwaLint-Core.package/SLResultDialog.class/instance/addSummaryResult.toEnvironment..st
@@ -1,7 +1,8 @@
 browsing
-addSummaryResult: aSLSummaryResult toEnvironment: anEnvironment	
+addSummaryResult: aSLSummaryResult toEnvironment: anEnvironment	 
 
 	| class |
+	self flag: #todo "update".
 	class := aSLSummaryResult testObject testObject.
 
 	aSLSummaryResult testObject instanceMethods do: [ :method |
@@ -13,5 +14,5 @@ addSummaryResult: aSLSummaryResult toEnvironment: anEnvironment
 	aSLSummaryResult testObject classMethods do: [ :method |
 		aSLSummaryResult selectForSummary: method ifTrue: [
 			anEnvironment 				
-				addClass: class class 
+				addClass: class theMetaClass 
 				selector: method methodSelector]].
diff --git a/packages/SwaLint-Core.package/SLResultDialog.class/methodProperties.json b/packages/SwaLint-Core.package/SLResultDialog.class/methodProperties.json
@@ -8,12 +8,12 @@
 		"open" : "NA 7/1/2015 11:30",
 		"windowColorSpecification" : "NA 7/1/2015 10:21" },
 	"instance" : {
-		"addClassSummaryResult:toMessageList:" : "ct 12/19/2024 20:18",
+		"addClassSummaryResult:toMessageList:" : "ct 12/22/2024 02:15",
 		"addEntry:to:" : "NA 7/29/2015 18:02",
 		"addResult:toEnvironment:" : "NA 7/2/2015 14:33",
 		"addResult:toMessageList:" : "NA 7/2/2015 14:37",
 		"addResultDictionaryEntryFor:at:with:and:" : "NA 7/29/2015 17:52",
-		"addSummaryResult:toEnvironment:" : "NA 7/2/2015 14:32",
+		"addSummaryResult:toEnvironment:" : "ct 12/22/2024 02:16",
 		"addSummaryResult:toMessageList:" : "ct 12/19/2024 20:18",
 		"addSystemSummaryResult:toMessageList:" : "ct 12/19/2024 20:18",
 		"browsable" : "NA 7/15/2015 16:11",

diff --git a/...ges/SwaLint-PlugIns.package/SLRBImportPlugIn.class/instance/classNameInSelectorMethod..st b/...ges/SwaLint-PlugIns.package/SLRBImportPlugIn.class/instance/classNameInSelectorMethod..st
@@ -7,7 +7,7 @@ classNameInSelectorMethod: aMethodTestObject
 	|class|
 	aMethodTestObject shouldBeMethod.
 	class := aMethodTestObject parent testClass.
-	((class class isMeta and: [aMethodTestObject classSide]) and: 
+	((class theMetaClass isMeta and: [aMethodTestObject classSide]) and: 
 		[(aMethodTestObject testObject selector 
 			indexOfSubCollection: class name
 			startingAt: 1) > 0]) ifTrue: 

diff --git a/packages/SwaLint-PlugIns.package/SLRBImportPlugIn.class/methodProperties.json b/packages/SwaLint-PlugIns.package/SLRBImportPlugIn.class/methodProperties.json
@@ -6,7 +6,7 @@
 		"maxLineSize" : "tfel 1/11/2011 11:35" },
 	"instance" : {
 		"classNameInSelector:" : "BD 6/21/2018 16:21",
-		"classNameInSelectorMethod:" : "smalltalkCI 5/5/2021 11:46",
+		"classNameInSelectorMethod:" : "ct 12/22/2024 02:11",
 		"collectionProtocolRule:" : "BD 6/21/2018 16:21",
 		"collectionProtocolRuleMethod:" : "BD 6/16/2018 11:21",
 		"ifTrueReturnsRule:" : "BD 6/21/2018 16:22",

diff --git a/...nstVarInSubclassesSuperTestClass.class/instance/newSLInstVarInSubclassesSuperTestClass.st b/...nstVarInSubclassesSuperTestClass.class/instance/newSLInstVarInSubclassesSuperTestClass.st
@@ -0,0 +1,3 @@
+testClassNameInSelector
+newSLInstVarInSubclassesSuperTestClass
+	^self new
diff --git a/...ges/SwaLint-Tests.package/SLInstVarInSubclassesSuperTestClass.class/methodProperties.json b/...ges/SwaLint-Tests.package/SLInstVarInSubclassesSuperTestClass.class/methodProperties.json
@@ -2,4 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
-		"doNothing" : "fm 5/17/2018 23:16" } }
+		"doNothing" : "fm 5/17/2018 23:16",
+		"newSLInstVarInSubclassesSuperTestClass" : "ct 12/22/2024 02:07" } }