Fixed spacing for anon subs

Fixes #1686
Camelcade · Dec 28, 2017 · e6ac565 · e6ac565
1 parent 043cad3
commit e6ac565
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 104 deletions.
diff --git a/src/com/perl5/lang/perl/idea/formatter/PerlFormattingTokenSets.java b/src/com/perl5/lang/perl/idea/formatter/PerlFormattingTokenSets.java
@@ -50,7 +50,7 @@ public interface PerlFormattingTokenSets extends PerlElementTypes {
   TokenSet SUB_DEFINITIONS_TOKENSET = TokenSet.create(
     METHOD_DEFINITION,
     FUNC_DEFINITION,
-
+    SUB_EXPR,
     SUB_DEFINITION,
     SUB_DECLARATION
   );

diff --git a/src/com/perl5/lang/perl/idea/formatter/PerlSpacingBuilderFactory.java b/src/com/perl5/lang/perl/idea/formatter/PerlSpacingBuilderFactory.java
@@ -54,15 +54,13 @@ static SpacingBuilder createSpacingBuilder(CommonCodeStyleSettings settings, Per
       .between(PACKAGE, VERSION_ELEMENT).spaces(1)
       .between(RESERVED_FORMAT, SUB_NAME).spaces(1)
 
-      .betweenInside(SUB_NAME, LEFT_PAREN, SUB_DEFINITION).spaceIf(settings.SPACE_BEFORE_METHOD_PARENTHESES)
-      .betweenInside(SUB_NAME, LEFT_PAREN, SUB_DECLARATION).spaceIf(settings.SPACE_BEFORE_METHOD_PARENTHESES)
-      .betweenInside(SUB_NAME, LEFT_PAREN, METHOD_DEFINITION).spaceIf(settings.SPACE_BEFORE_METHOD_PARENTHESES)
-      .betweenInside(SUB_NAME, LEFT_PAREN, FUNC_DEFINITION).spaceIf(settings.SPACE_BEFORE_METHOD_PARENTHESES)
+      .beforeInside(LEFT_PAREN, SUB_DEFINITIONS_TOKENSET).spaceIf(settings.SPACE_BEFORE_METHOD_PARENTHESES)
 
       .betweenInside(LEFT_PAREN, RIGHT_PAREN, SUB_DEFINITION).spaceIf(settings.SPACE_WITHIN_EMPTY_METHOD_PARENTHESES)
       .betweenInside(LEFT_PAREN, RIGHT_PAREN, SUB_DECLARATION).spaceIf(settings.SPACE_WITHIN_EMPTY_METHOD_PARENTHESES)
       .betweenInside(LEFT_PAREN, RIGHT_PAREN, METHOD_DEFINITION).spaceIf(settings.SPACE_WITHIN_EMPTY_METHOD_PARENTHESES)
       .betweenInside(LEFT_PAREN, RIGHT_PAREN, FUNC_DEFINITION).spaceIf(settings.SPACE_WITHIN_EMPTY_METHOD_PARENTHESES)
+      .betweenInside(LEFT_PAREN, RIGHT_PAREN, SUB_EXPR).spaceIf(settings.SPACE_WITHIN_EMPTY_METHOD_PARENTHESES)
 
       .afterInside(LEFT_PAREN, SUB_DEFINITIONS_TOKENSET).spaceIf(settings.SPACE_WITHIN_METHOD_PARENTHESES)
       .beforeInside(RIGHT_PAREN, SUB_DEFINITIONS_TOKENSET).spaceIf(settings.SPACE_WITHIN_METHOD_PARENTHESES)

diff --git a/testData/formatter/perl/spacing/declarations.code b/testData/formatter/perl/spacing/declarations.code
@@ -15,25 +15,20 @@ sub       subname                            (              $a
 method       subname                            (              $a                            ,       $b                            ,       $c              )    {}
 func       subname                            (              $a                            ,       $b                            ,       $c              )      {}
 sub  something  (  )    :  method    :  other    :  something    {  }
-
 sub  something  (  )    :  method    :  other    :  something;
-
 method  something  (  )    :  method    :  other    :  something    {  }
-
 func  something  (  )    :  method    :  other    :  something    {  }
-
 my  $var    :  method    :  other    :  something;
-
 my  (  $var1,  $var2,  $var3)    :  method    :  other    :  something;
-
 sub  so  (  )    :  me          :  ot                    :  so    {  }
-
 sub  so  (  )    :  me          :  ot                    :  so  ;
-
 method  so  (  )    :  me          :  ot                    :  so    {  }
-
 func  so  (  )    :  me          :  ot                    :  so      {  }
-
 my  $var    :  me          :  ot                    :  so  ;
-
 my  (  $v1,  $v2,  $v3   )    :  me          :  ot                    :  so  ;
+sub         {               };
+sub   (      )      {            };
+sub   (   $var   )      {         };
+sub         :   method      {               };
+sub   (      )         :   method            {            };
+sub   (   $var   )      :   method            {         };
diff --git a/testData/formatter/perl/spacing/declarationsBeforeAttributeFalse.txt b/testData/formatter/perl/spacing/declarationsBeforeAttributeFalse.txt
@@ -15,25 +15,20 @@ sub subname($a, $b, $c) {}
 method subname($a, $b, $c) {}
 func subname($a, $b, $c) {}
 sub something():method:other:something {}
-
 sub something():method:other:something;
-
 method something():method:other:something {}
-
 func something():method:other:something {}
-
 my $var:method:other:something;
-
 my ($var1, $var2, $var3):method:other:something;
-
 sub so():me:ot:so {}
-
 sub so():me:ot:so;
-
 method so():me:ot:so {}
-
 func so():me:ot:so {}
-
 my $var:me:ot:so;
-
 my ($v1, $v2, $v3):me:ot:so;
+sub {};
+sub() {};
+sub($var) {};
+sub:method {};
+sub():method {};
+sub($var):method {};
diff --git a/testData/formatter/perl/spacing/declarationsBeforeAttributeTrue.txt b/testData/formatter/perl/spacing/declarationsBeforeAttributeTrue.txt
@@ -15,25 +15,20 @@ sub subname($a, $b, $c) {}
 method subname($a, $b, $c) {}
 func subname($a, $b, $c) {}
 sub something() :method :other :something {}
-
 sub something() :method :other :something;
-
 method something() :method :other :something {}
-
 func something() :method :other :something {}
-
 my $var :method :other :something;
-
 my ($var1, $var2, $var3) :method :other :something;
-
 sub so() :me :ot :so {}
-
 sub so() :me :ot :so;
-
 method so() :me :ot :so {}
-
 func so() :me :ot :so {}
-
 my $var :me :ot :so;
-
 my ($v1, $v2, $v3) :me :ot :so;
+sub {};
+sub() {};
+sub($var) {};
+sub :method {};
+sub() :method {};
+sub($var) :method {};
diff --git a/testData/formatter/perl/spacing/declarationsBeforeSignatureFalse.txt b/testData/formatter/perl/spacing/declarationsBeforeSignatureFalse.txt
@@ -15,25 +15,20 @@ sub subname($a, $b, $c) {}
 method subname($a, $b, $c) {}
 func subname($a, $b, $c) {}
 sub something() :method :other :something {}
-
 sub something() :method :other :something;
-
 method something() :method :other :something {}
-
 func something() :method :other :something {}
-
 my $var :method :other :something;
-
 my ($var1, $var2, $var3) :method :other :something;
-
 sub so() :me :ot :so {}
-
 sub so() :me :ot :so;
-
 method so() :me :ot :so {}
-
 func so() :me :ot :so {}
-
 my $var :me :ot :so;
-
 my ($v1, $v2, $v3) :me :ot :so;
+sub {};
+sub() {};
+sub($var) {};
+sub :method {};
+sub() :method {};
+sub($var) :method {};
diff --git a/testData/formatter/perl/spacing/declarationsBeforeSignatureTrue.txt b/testData/formatter/perl/spacing/declarationsBeforeSignatureTrue.txt
@@ -15,25 +15,20 @@ sub subname ($a, $b, $c) {}
 method subname ($a, $b, $c) {}
 func subname ($a, $b, $c) {}
 sub something () :method :other :something {}
-
 sub something () :method :other :something;
-
 method something () :method :other :something {}
-
 func something () :method :other :something {}
-
 my $var :method :other :something;
-
 my ($var1, $var2, $var3) :method :other :something;
-
 sub so () :me :ot :so {}
-
 sub so () :me :ot :so;
-
 method so () :me :ot :so {}
-
 func so () :me :ot :so {}
-
 my $var :me :ot :so;
-
 my ($v1, $v2, $v3) :me :ot :so;
+sub {};
+sub () {};
+sub ($var) {};
+sub :method {};
+sub () :method {};
+sub ($var) :method {};
diff --git a/testData/formatter/perl/spacing/declarationsWithinEmptySignatureFalse.txt b/testData/formatter/perl/spacing/declarationsWithinEmptySignatureFalse.txt
@@ -15,25 +15,20 @@ sub subname($a, $b, $c) {}
 method subname($a, $b, $c) {}
 func subname($a, $b, $c) {}
 sub something() :method :other :something {}
-
 sub something() :method :other :something;
-
 method something() :method :other :something {}
-
 func something() :method :other :something {}
-
 my $var :method :other :something;
-
 my ($var1, $var2, $var3) :method :other :something;
-
 sub so() :me :ot :so {}
-
 sub so() :me :ot :so;
-
 method so() :me :ot :so {}
-
 func so() :me :ot :so {}
-
 my $var :me :ot :so;
-
 my ($v1, $v2, $v3) :me :ot :so;
+sub {};
+sub() {};
+sub($var) {};
+sub :method {};
+sub() :method {};
+sub($var) :method {};
diff --git a/testData/formatter/perl/spacing/declarationsWithinEmptySignatureTrue.txt b/testData/formatter/perl/spacing/declarationsWithinEmptySignatureTrue.txt
@@ -15,25 +15,20 @@ sub subname($a, $b, $c) {}
 method subname($a, $b, $c) {}
 func subname($a, $b, $c) {}
 sub something( ) :method :other :something {}
-
 sub something( ) :method :other :something;
-
 method something( ) :method :other :something {}
-
 func something( ) :method :other :something {}
-
 my $var :method :other :something;
-
 my ($var1, $var2, $var3) :method :other :something;
-
 sub so( ) :me :ot :so {}
-
 sub so( ) :me :ot :so;
-
 method so( ) :me :ot :so {}
-
 func so( ) :me :ot :so {}
-
 my $var :me :ot :so;
-
 my ($v1, $v2, $v3) :me :ot :so;
+sub {};
+sub( ) {};
+sub($var) {};
+sub :method {};
+sub( ) :method {};
+sub($var) :method {};
diff --git a/testData/formatter/perl/spacing/declarationsWithinSignatureFalse.txt b/testData/formatter/perl/spacing/declarationsWithinSignatureFalse.txt
@@ -15,25 +15,20 @@ sub subname($a, $b, $c) {}
 method subname($a, $b, $c) {}
 func subname($a, $b, $c) {}
 sub something() :method :other :something {}
-
 sub something() :method :other :something;
-
 method something() :method :other :something {}
-
 func something() :method :other :something {}
-
 my $var :method :other :something;
-
 my ($var1, $var2, $var3) :method :other :something;
-
 sub so() :me :ot :so {}
-
 sub so() :me :ot :so;
-
 method so() :me :ot :so {}
-
 func so() :me :ot :so {}
-
 my $var :me :ot :so;
-
 my ($v1, $v2, $v3) :me :ot :so;
+sub {};
+sub() {};
+sub($var) {};
+sub :method {};
+sub() :method {};
+sub($var) :method {};
diff --git a/testData/formatter/perl/spacing/declarationsWithinSignatureTrue.txt b/testData/formatter/perl/spacing/declarationsWithinSignatureTrue.txt
@@ -15,25 +15,20 @@ sub subname( $a, $b, $c ) {}
 method subname( $a, $b, $c ) {}
 func subname( $a, $b, $c ) {}
 sub something() :method :other :something {}
-
 sub something() :method :other :something;
-
 method something() :method :other :something {}
-
 func something() :method :other :something {}
-
 my $var :method :other :something;
-
 my ($var1, $var2, $var3) :method :other :something;
-
 sub so() :me :ot :so {}
-
 sub so() :me :ot :so;
-
 method so() :me :ot :so {}
-
 func so() :me :ot :so {}
-
 my $var :me :ot :so;
-
 my ($v1, $v2, $v3) :me :ot :so;
+sub {};
+sub() {};
+sub( $var ) {};
+sub :method {};
+sub() :method {};
+sub( $var ) :method {};