From c39e2e8e5c53df2121d681e70e0bb0584b395223 Mon Sep 17 00:00:00 2001 From: Torsten Bergmann Date: Wed, 24 Jun 2020 08:41:40 +0200 Subject: [PATCH] Cleanup Debugger-Filters package Fix #6667 --- src/Debugger-Filters/BlockFilter.class.st | 2 +- src/Debugger-Filters/BooleanFilter.class.st | 5 ++-- .../KernelClassesFilter.class.st | 2 +- .../ManifestDebuggerFilters.class.st | 23 +++++++++++++++++++ src/Debugger-Filters/SelectorFilter.class.st | 13 ++++------- src/Debugger-Filters/StackFilter.class.st | 7 +++++- 6 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 src/Debugger-Filters/ManifestDebuggerFilters.class.st diff --git a/src/Debugger-Filters/BlockFilter.class.st b/src/Debugger-Filters/BlockFilter.class.st index e9b926a6c85..d8e78b4c9ea 100644 --- a/src/Debugger-Filters/BlockFilter.class.st +++ b/src/Debugger-Filters/BlockFilter.class.st @@ -7,7 +7,7 @@ Class { #instVars : [ 'block' ], - #category : #'Debugger-Filters' + #category : #'Debugger-Filters-Base' } { #category : #'instance creation' } diff --git a/src/Debugger-Filters/BooleanFilter.class.st b/src/Debugger-Filters/BooleanFilter.class.st index d79027afbd2..46670763609 100644 --- a/src/Debugger-Filters/BooleanFilter.class.st +++ b/src/Debugger-Filters/BooleanFilter.class.st @@ -8,7 +8,7 @@ Class { 'filters', 'booleanOperator' ], - #category : #'Debugger-Filters' + #category : #'Debugger-Filters-Base' } { #category : #'instance creation' } @@ -40,5 +40,6 @@ BooleanFilter >> filters: theFilters [ { #category : #testing } BooleanFilter >> shouldDisplay: aContext [ - ^ (self filters first shouldDisplay: aContext) perform: booleanOperator with: [self filters last shouldDisplay: aContext] + ^ (self filters first shouldDisplay: aContext) + perform: booleanOperator with: [self filters last shouldDisplay: aContext] ] diff --git a/src/Debugger-Filters/KernelClassesFilter.class.st b/src/Debugger-Filters/KernelClassesFilter.class.st index c829717df1b..313ed8fd759 100644 --- a/src/Debugger-Filters/KernelClassesFilter.class.st +++ b/src/Debugger-Filters/KernelClassesFilter.class.st @@ -7,7 +7,7 @@ Class { #instVars : [ 'kernelClasses' ], - #category : #'Debugger-Filters' + #category : #'Debugger-Filters-Base' } { #category : #initialization } diff --git a/src/Debugger-Filters/ManifestDebuggerFilters.class.st b/src/Debugger-Filters/ManifestDebuggerFilters.class.st new file mode 100644 index 00000000000..8cc633aa34d --- /dev/null +++ b/src/Debugger-Filters/ManifestDebuggerFilters.class.st @@ -0,0 +1,23 @@ +" +I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser +" +Class { + #name : #ManifestDebuggerFilters, + #superclass : #PackageManifest, + #category : #'Debugger-Filters-Manifest' +} + +{ #category : #'code-critics' } +ManifestDebuggerFilters class >> ruleBadMessageRule2V1FalsePositive [ + ^ #(#(#(#RGMethodDefinition #(#BooleanFilter #shouldDisplay: #false)) #'2020-06-24T08:38:44.359688+02:00') ) +] + +{ #category : #'code-critics' } +ManifestDebuggerFilters class >> ruleCollectionMessagesToExternalObjectRuleV1FalsePositive [ + ^ #(#(#(#RGMetaclassDefinition #(#'SelectorFilter class' #SelectorFilter)) #'2020-06-24T08:39:44.785251+02:00') ) +] + +{ #category : #'code-critics' } +ManifestDebuggerFilters class >> ruleUsesTrueRuleV1FalsePositive [ + ^ #(#(#(#RGMethodDefinition #(#KernelClassesFilter #kernelClassesToExclude #false)) #'2020-06-24T08:38:55.095241+02:00') ) +] diff --git a/src/Debugger-Filters/SelectorFilter.class.st b/src/Debugger-Filters/SelectorFilter.class.st index fc554792ce4..abad0b43847 100644 --- a/src/Debugger-Filters/SelectorFilter.class.st +++ b/src/Debugger-Filters/SelectorFilter.class.st @@ -7,13 +7,12 @@ Class { #instVars : [ 'selectors' ], - #category : #'Debugger-Filters' + #category : #'Debugger-Filters-Base' } { #category : #'instance creation' } SelectorFilter class >> forSelector: aSelector [ - |filter| - + |filter| filter:= self new. filter selectors add: aSelector. ^ filter @@ -21,8 +20,7 @@ SelectorFilter class >> forSelector: aSelector [ { #category : #'instance creation' } SelectorFilter class >> forSelectors: someSelectors [ - |filter| - + |filter| filter:= self new. filter selectors addAll: someSelectors. ^ filter @@ -31,7 +29,7 @@ SelectorFilter class >> forSelectors: someSelectors [ { #category : #initialization } SelectorFilter >> initialize [ super initialize. - self selectors: OrderedCollection new. + self selectors: OrderedCollection new ] { #category : #accessing } @@ -46,6 +44,5 @@ SelectorFilter >> selectors: someSelectors [ { #category : #testing } SelectorFilter >> shouldDisplay: aContext [ - ^ (self selectors - includes: aContext method selector) not. + ^ (self selectors includes: aContext method selector) not ] diff --git a/src/Debugger-Filters/StackFilter.class.st b/src/Debugger-Filters/StackFilter.class.st index fc694ea0117..d273d27138d 100644 --- a/src/Debugger-Filters/StackFilter.class.st +++ b/src/Debugger-Filters/StackFilter.class.st @@ -4,9 +4,14 @@ A filter on the current stack for debugging Class { #name : #StackFilter, #superclass : #Object, - #category : #'Debugger-Filters' + #category : #'Debugger-Filters-Base' } +{ #category : #testing } +StackFilter class >> isAbstract [ + ^self == StackFilter +] + { #category : #operators } StackFilter >> and: aFilter [ ^ BooleanFilter withFilters: (OrderedCollection with: self with: aFilter) operator: #and: