Fix lazyInitializerRegex and broken tests

moosetechnology · Apr 12, 2024 · 45fb82c · 45fb82c
1 parent d020617
commit 45fb82c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Moose-Blueprint-Models-Tests/CBLazyInitializerRegexTest.class.st b/Moose-Blueprint-Models-Tests/CBLazyInitializerRegexTest.class.st
@@ -13,7 +13,7 @@ CBLazyInitializerRegexTest >> javaSourceCode1 [
 
 	^ javaModel newSourceTextAnchor
 		  source: 'public void myAttribute()
-   if (myAttribute == nul ) {
+   if (myAttribute == null) {
       myAttribute = this.initializeMyAttribute;
     }
     return myAttribute ;
@@ -28,7 +28,7 @@ CBLazyInitializerRegexTest >> javaSourceCode2 [
 		  source: 'public void myAttribute()
    if (
 
-myAttribute == nul ) {
+myAttribute == null) {
       myAttribute = this.initializeMyAttribute;
     }
 
@@ -42,7 +42,7 @@ CBLazyInitializerRegexTest >> javaSourceCode3 [
 
 	^ javaModel newSourceTextAnchor
 		  source: 'public void myAttribute() {  
-   if ( myAttribute == nul ) {
+   if ( myAttribute == null ) {
       myAttribute = this.initializeMyAttribute;
     								}
 	return myAttribute ;

diff --git a/Moose-Blueprint-Models/FamixJavaMethod.extension.st b/Moose-Blueprint-Models/FamixJavaMethod.extension.st
@@ -127,5 +127,5 @@ FamixJavaMethod >> isSubPublic [
 { #category : #'*Moose-Blueprint-Models' }
 FamixJavaMethod >> lazyInitializerRegex [
 
-	^ '.*if\s*\(\s*(this\.)?\w+\s*==\s*null\s*\)\s*\{\s*(this\.)?\w+\s*=.*;\s*\}\s*return\s*(this\.)\w+\s*;\s*\}\s*'
+	^ '.*if\s*\(\s*(this\.)?\w+\s*==\s*null\s*\)\s*\{\s*(this\.)?\w+\s*=.*;\s*\}\s*return\s+(this\.)?\w+\s*;\s*\}\s*'
 ]