Distinguish named and anonymous functions

Author: jcberquist

.cfformat.json

@@ -9,6 +9,13 @@
     "brackets.padding": false,
     "comment.asterisks": "align",
     "for_loop_semicolons.padding": true,
+    "function_anonymous.empty_padding": false,
+    "function_anonymous.group_to_block_spacing": "spaced",
+    "function_anonymous.multiline.element_count": 4,
+    "function_anonymous.multiline.leading_comma": false,
+    "function_anonymous.multiline.leading_comma.padding": true,
+    "function_anonymous.multiline.min_length": 40,
+    "function_anonymous.padding": false,
     "function_call.empty_padding": false,
     "function_call.multiline.element_count": 4,
     "function_call.multiline.leading_comma": false,
@@ -31,8 +38,8 @@
     "keywords.spacing_to_group": true,
     "max_columns": 120,
     "parentheses.padding": false,
-    "strings.quote": "single",
     "strings.attributes.quote": "double",
+    "strings.quote": "single",
     "struct.empty_padding": false,
     "struct.multiline.element_count": 4,
     "struct.multiline.leading_comma": false,

data/examples.json

@@ -7,15 +7,20 @@
     "brackets.padding":"// brackets.padding: true\na[ 'mykey' ][ 1 ] = 7;\n\n// brackets.padding: false\na['mykey'][1] = 7;",
     "comment.asterisks":"// comment.asterisks: \"align\"\n{\n    /**\n     * a comment\n     */\n}\n\n// comment.asterisks: \"indent\"\n{\n    /**\n    * a comment\n    */\n}\n\n// comment.asterisks: \"\"\n{\n    /**\n      * a comment\n    */\n}",
     "for_loop_semicolons.padding":"// for_loop_semicolons.padding: true\nfor (var i = 0; i < 10; i++) {\n}\n\n// for_loop_semicolons.padding: false\nfor (var i = 0;i < 10;i++) {\n}",
+    "function_anonymous.empty_padding":"// function_anonymous.empty_padding: true\nfunction( ) {\n}\n\n// function_anonymous.empty_padding: false\nfunction() {\n}",
+    "function_anonymous.group_to_block_spacing":"// function_anonymous.group_to_block_spacing: \"spaced\"\nfunction() {\n}\n\n// function_anonymous.group_to_block_spacing: \"compact\"\nfunction(){\n}\n\n// function_anonymous.group_to_block_spacing: \"newline\"\nfunction()\n{\n}",
+    "function_anonymous.multiline.leading_comma":"// function_anonymous.multiline.leading_comma: true\nfunction(\n      a\n    , b\n    , c\n    , d\n) {\n}\n\n// function_anonymous.multiline.leading_comma: false\nfunction(\n    a,\n    b,\n    c,\n    d\n) {\n}",
+    "function_anonymous.multiline.leading_comma.padding":"// function_anonymous.multiline.leading_comma.padding: true\nfunction(\n      a\n    , b\n    , c\n    , d\n) {\n}\n\n// function_anonymous.multiline.leading_comma.padding: false\nfunction(\n     a\n    ,b\n    ,c\n    ,d\n) {\n}",
+    "function_anonymous.padding":"// function_anonymous.padding: true\nfunction( a, b ) {\n}\n\n// function_anonymous.padding: false\nfunction(a, b) {\n}",
     "function_call.empty_padding":"// function_call.empty_padding: true\nmyFunc( );\n\n// function_call.empty_padding: false\nmyFunc();",
     "function_call.multiline.leading_comma":"// function_call.multiline.leading_comma: true\nmyFunc(\n      1\n    , 2\n    , 3\n    , 4\n);\n\n// function_call.multiline.leading_comma: false\nmyFunc(\n    1,\n    2,\n    3,\n    4\n);",
     "function_call.multiline.leading_comma.padding":"// function_call.multiline.leading_comma.padding: true\nmyFunc(\n      1\n    , 2\n    , 3\n    , 4\n);\n\n// function_call.multiline.leading_comma.padding: false\nmyFunc(\n     1\n    ,2\n    ,3\n    ,4\n);",
     "function_call.padding":"// function_call.padding: true\nmyFunc( 1, 2 );\n\n// function_call.padding: false\nmyFunc(1, 2);",
-    "function_declaration.empty_padding":"// function_declaration.empty_padding: true\nfunction( ) {\n}\n\n// function_declaration.empty_padding: false\nfunction() {\n}",
-    "function_declaration.group_to_block_spacing":"// function_declaration.group_to_block_spacing: \"spaced\"\nfunction() {\n}\n\n// function_declaration.group_to_block_spacing: \"compact\"\nfunction(){\n}\n\n// function_declaration.group_to_block_spacing: \"newline\"\nfunction()\n{\n}",
-    "function_declaration.multiline.leading_comma":"// function_declaration.multiline.leading_comma: true\nfunction(\n      a\n    , b\n    , c\n    , d\n) {\n}\n\n// function_declaration.multiline.leading_comma: false\nfunction(\n    a,\n    b,\n    c,\n    d\n) {\n}",
-    "function_declaration.multiline.leading_comma.padding":"// function_declaration.multiline.leading_comma.padding: true\nfunction(\n      a\n    , b\n    , c\n    , d\n) {\n}\n\n// function_declaration.multiline.leading_comma.padding: false\nfunction(\n     a\n    ,b\n    ,c\n    ,d\n) {\n}",
-    "function_declaration.padding":"// function_declaration.padding: true\nfunction( a, b ) {\n}\n\n// function_declaration.padding: false\nfunction(a, b) {\n}",
+    "function_declaration.empty_padding":"// function_declaration.empty_padding: true\nfunction example( ) {\n}\n\n// function_declaration.empty_padding: false\nfunction example() {\n}",
+    "function_declaration.group_to_block_spacing":"// function_declaration.group_to_block_spacing: \"spaced\"\nfunction example() {\n}\n\n// function_declaration.group_to_block_spacing: \"compact\"\nfunction example(){\n}\n\n// function_declaration.group_to_block_spacing: \"newline\"\nfunction example()\n{\n}",
+    "function_declaration.multiline.leading_comma":"// function_declaration.multiline.leading_comma: true\nfunction example(\n      a\n    , b\n    , c\n    , d\n) {\n}\n\n// function_declaration.multiline.leading_comma: false\nfunction example(\n    a,\n    b,\n    c,\n    d\n) {\n}",
+    "function_declaration.multiline.leading_comma.padding":"// function_declaration.multiline.leading_comma.padding: true\nfunction example(\n      a\n    , b\n    , c\n    , d\n) {\n}\n\n// function_declaration.multiline.leading_comma.padding: false\nfunction example(\n     a\n    ,b\n    ,c\n    ,d\n) {\n}",
+    "function_declaration.padding":"// function_declaration.padding: true\nfunction example( a, b ) {\n}\n\n// function_declaration.padding: false\nfunction example(a, b) {\n}",
     "indent_size":"// indent_size: 4\ndo {\n    myFunc();\n}\n\n// indent_size: 2\ndo {\n  myFunc();\n}",
     "keywords.block_to_keyword_spacing":"// keywords.block_to_keyword_spacing: \"spaced\"\nif (true) {\n} else {\n}\n\n// keywords.block_to_keyword_spacing: \"compact\"\nif (true) {\n}else {\n}\n\n// keywords.block_to_keyword_spacing: \"newline\"\nif (true) {\n}\nelse {\n}",
     "keywords.empty_group_spacing":"// keywords.empty_group_spacing: true\nif ( ) {\n}\n\n// keywords.empty_group_spacing: false\nif () {\n}",

data/reference.json

@@ -62,7 +62,11 @@
             "code": "{/**\n      * a comment\n    */}"
         },
         "type": "string",
-        "values": ["align", "indent", ""]
+        "values": [
+            "align",
+            "indent",
+            ""
+        ]
     },
     "for_loop_semicolons.padding": {
         "description": "When true, insert a space after for loop semicolons.",
@@ -71,6 +75,61 @@
         },
         "type": "boolean"
     },
+    "function_anonymous.empty_padding": {
+        "description": "When true, pad anonymous function declarations that have no parameters with a space.",
+        "example": {
+            "code": "function() {}"
+        },
+        "type": "boolean"
+    },
+    "function_anonymous.group_to_block_spacing": {
+        "description": "How to space from the anonymous function parameters to the function block.",
+        "example": {
+            "code": "function() {}"
+        },
+        "type": "string",
+        "values": [
+            "spaced",
+            "compact",
+            "newline"
+        ]
+    },
+    "function_anonymous.multiline.element_count": {
+        "description": "When an anonymous function declaration has this number of parameters, split them onto multiple lines.",
+        "type": "integer"
+    },
+    "function_anonymous.multiline.leading_comma": {
+        "description": "Whether to use a leading comma when anonymous function declaration parameters are printed on multiple lines.",
+        "example": {
+            "code": "function(a,b,c,d) {}",
+            "settings": {
+                "function_anonymous.multiline.min_length": 1
+            }
+        },
+        "type": "boolean"
+    },
+    "function_anonymous.multiline.leading_comma.padding": {
+        "description": "Whether to insert a space after leading commas when anonymous function declaration parameters are printed on multiple lines.",
+        "example": {
+            "code": "function(a,b,c,d) {}",
+            "settings": {
+                "function_anonymous.multiline.leading_comma": true,
+                "function_anonymous.multiline.min_length": 1
+            }
+        },
+        "type": "boolean"
+    },
+    "function_anonymous.multiline.min_length": {
+        "description": "No matter how many parameters an anonymous function declaration has, if they can be printed in this many columns or less, keep them on one line.",
+        "type": "integer"
+    },
+    "function_anonymous.padding": {
+        "description": "Whether to pad non-empty anonymous function declarations with spaces.",
+        "example": {
+            "code": "function(a,b) {}"
+        },
+        "type": "boolean"
+    },
     "function_call.empty_padding": {
         "description": "When true, function calls with no arguments are padded with a space.",
         "example": {
@@ -117,17 +176,21 @@
     "function_declaration.empty_padding": {
         "description": "When true, pad function declarations that have no parameters with a space.",
         "example": {
-            "code": "function() {}"
+            "code": "function example() {}"
         },
         "type": "boolean"
     },
     "function_declaration.group_to_block_spacing": {
         "description": "How to space from the function parameters to the function block.",
         "example": {
-            "code": "function() {}"
+            "code": "function example() {}"
         },
         "type": "string",
-        "values": ["spaced", "compact", "newline"]
+        "values": [
+            "spaced",
+            "compact",
+            "newline"
+        ]
     },
     "function_declaration.multiline.element_count": {
         "description": "When a function declaration has this number of parameters, split them onto multiple lines.",
@@ -136,7 +199,7 @@
     "function_declaration.multiline.leading_comma": {
         "description": "Whether to use a leading comma when function declaration parameters are printed on multiple lines.",
         "example": {
-            "code": "function(a,b,c,d) {}",
+            "code": "function example(a,b,c,d) {}",
             "settings": {
                 "function_declaration.multiline.min_length": 1
             }
@@ -146,7 +209,7 @@
     "function_declaration.multiline.leading_comma.padding": {
         "description": "Whether to insert a space after leading commas when function declaration parameters are printed on multiple lines.",
         "example": {
-            "code": "function(a,b,c,d) {}",
+            "code": "function example(a,b,c,d) {}",
             "settings": {
                 "function_declaration.multiline.leading_comma": true,
                 "function_declaration.multiline.min_length": 1
@@ -159,17 +222,20 @@
         "type": "integer"
     },
     "function_declaration.padding": {
-        "description": "Whether to pad non-empty function calls with spaces.",
+        "description": "Whether to pad non-empty function declarations with spaces.",
         "example": {
-            "code": "function(a,b) {}"
+            "code": "function example(a,b) {}"
         },
         "type": "boolean"
     },
     "indent_size": {
         "description": "Each indent level or tab is equivalent to this many spaces.",
         "example": {
             "code": "do {myFunc();}",
-            "values": [4, 2]
+            "values": [
+                4,
+                2
+            ]
         },
         "type": "integer"
     },
@@ -179,7 +245,11 @@
             "code": "if(true){}else{}"
         },
         "type": "string",
-        "values": ["spaced", "compact", "newline"]
+        "values": [
+            "spaced",
+            "compact",
+            "newline"
+        ]
     },
     "keywords.empty_group_spacing": {
         "description": "Whether to pad empty keyword groups.",
@@ -194,7 +264,11 @@
             "code": "if(true){}"
         },
         "type": "string",
-        "values": ["spaced", "compact", "newline"]
+        "values": [
+            "spaced",
+            "compact",
+            "newline"
+        ]
     },
     "keywords.padding_inside_group": {
         "description": "Whether to pad inside non-empty keyword groups.",
@@ -209,7 +283,11 @@
             "code": "do{}"
         },
         "type": "string",
-        "values": ["spaced", "compact", "newline"]
+        "values": [
+            "spaced",
+            "compact",
+            "newline"
+        ]
     },
     "keywords.spacing_to_group": {
         "description": "Whether to space a keyword from following group.",
@@ -235,15 +313,23 @@
             "code": "http url='www.google.com';\nparam name=\"key\";"
         },
         "type": "string",
-        "values": ["single", "double", ""]
+        "values": [
+            "single",
+            "double",
+            ""
+        ]
     },
     "strings.quote": {
         "description": "Whether to use a single or double quote for strings. If set to an empty string, leaves string quotes as they are found.",
         "example": {
             "code": "a=\"One\";\nb='Two';"
         },
         "type": "string",
-        "values": ["single", "double", ""]
+        "values": [
+            "single",
+            "double",
+            ""
+        ]
     },
     "struct.empty_padding": {
         "description": "When true, non-empty structs are padded with spaces.",
@@ -292,7 +378,12 @@
         "description": "The key value separator to use in structs - it must contain either a single `:` or `=` and be no more than 3 characters in length.",
         "example": {
             "code": "myStruct={a:1,b:2};",
-            "values": [": ", " = ", " : ", "="]
+            "values": [
+                ": ",
+                " = ",
+                " : ",
+                "="
+            ]
         },
         "type": "struct-key-value"
     },

models/cfscript/Functions.cfc

@@ -19,21 +19,23 @@ component {
         columnOffset
     ) {
         if (cftokens.peekScopes(functionStart)) {
-            var nextToken = cftokens.next(false);
-            var isComponentMethod = nextToken[2][nextToken[2].len() - 2] == 'meta.class.body.cfml';
-
-            var formattedText = nextToken[1];
+            var words = [];
 
             while (!cftokens.nextIsElement()) {
-                formattedText &= ' ' & cftokens.next(false)[1];
+                var token = cftokens.next(false)
+                words.append(token[1]);
             }
 
+            var formattedText = words.toList(' ');
+            var rootSettingKey = token[2].last() == 'entity.name.function.cfml' ? 'function_declaration' : 'function_anonymous';
+
             // parameters
             var parametersTxt = printFunctionParameters(
                 cftokens.next(false),
                 settings,
                 indent,
-                columnOffset + formattedText.len()
+                columnOffset + formattedText.len(),
+                rootSettingKey
             );
 
             columnOffset += parametersTxt.len();
@@ -60,11 +62,11 @@ component {
             }
 
             if (
-                settings['function_declaration.group_to_block_spacing'] == 'spaced' &&
+                settings['#rootSettingKey#.group_to_block_spacing'] == 'spaced' &&
                 !attributesTxt.find(chr(10))
             ) {
                 formattedText = formattedText & ' ';
-            } else if (settings['function_declaration.group_to_block_spacing'] == 'newline') {
+            } else if (settings['#rootSettingKey#.group_to_block_spacing'] == 'newline') {
                 formattedText &= settings.lf & cfformat.indentTo(indent, settings);
             }
 
@@ -76,16 +78,19 @@ component {
         }
 
         if (cftokens.peekElement('function-parameters')) {
+            var parametersElement = cftokens.next(false);
+            var arrowToken = cftokens.next(false);
+
             // arrow function parameters
             var formattedText = printFunctionParameters(
-                cftokens.next(false),
+                parametersElement,
                 settings,
                 indent,
-                columnOffset
+                columnOffset,
+                'function_anonymous'
             );
 
-            // collect the arrow `=>`
-            var arrowToken = cftokens.next(false);
+            // add the arrow `=>`
             formattedText &= ' => ';
 
             columnOffset += formattedText.len();
@@ -126,22 +131,23 @@ component {
         element,
         settings,
         indent,
-        columnOffset
+        columnOffset,
+        rootSettingKey
     ) {
         var printedElements = cfformat.delimited.printElements(element, settings, indent);
 
         if (printedElements.printed.len() == 1 && printedElements.printed[1].trim() == '') {
-            return settings['function_declaration.empty_padding'] ? '( )' : '()';
+            return settings['#rootSettingKey#.empty_padding'] ? '( )' : '()';
         }
 
-        var spacer = settings['function_declaration.padding'] ? ' ' : '';
+        var spacer = settings['#rootSettingKey#.padding'] ? ' ' : '';
         var delimiter = ', ';
         var formatted = '(' & spacer & printedElements.printed.tolist(delimiter) & spacer & ')';
 
         if (
             (
-                printedElements.printed.len() < settings['function_declaration.multiline.element_count'] ||
-                formatted.len() <= settings['function_declaration.multiline.min_length']
+                printedElements.printed.len() < settings['#rootSettingKey#.multiline.element_count'] ||
+                formatted.len() <= settings['#rootSettingKey#.multiline.min_length']
             ) &&
             !formatted.find(chr(10)) &&
             columnOffset + formatted.len() <= settings.max_columns
@@ -151,7 +157,7 @@ component {
 
         var formattedText = '(';
         formattedText &= cfformat.delimited.joinElements(
-            'function_declaration',
+            rootSettingKey,
             printedElements,
             settings,
             indent