Various Fixes

- Ensure attribute region exists before getting string
- reset indentation level during indenting if line is not cfscript
- simplify format region selection
- ensure method chains are in cfscript

Author: jcberquist

src/component_parser/cfml_functions.py

@@ -61,8 +61,11 @@ def find_script_functions(file_string, cfscript_range):
 
         attributes = ''
         func_body_range = params_range.parent.next_child_range(params_range.end, ['curly_brackets', 'semicolon'])
-        attributes = file_string[params_range.end:func_body_range.start]
-        l.append(attributes)
+        if func_body_range:
+            attributes = file_string[params_range.end:func_body_range.start]
+            l.append(attributes)
+        else:
+            l.append('')
 
         functions.append(parse_script_function(regex.ScriptFunction._make(l)))
     return functions

src/formatting/alignment.py

@@ -15,8 +15,9 @@
     'punctuation.section.group.end.cfml'
 ]
 
-non_indent_regions = [
-    'embedding.cfml -source.cfml.script',
+non_script_selector = 'embedding.cfml -source.cfml.script'
+
+non_indent_selector = [
     'comment.block.cfml -punctuation.definition.comment.cfml',
     'meta.string -punctuation.definition.string.begin'
 ]
@@ -29,11 +30,18 @@ def indent_region(cfml_format):
     end_indent_selector = ','.join(end_indent_selectors)
     accessor_selector = 'punctuation.accessor.cfml'
 
-    non_cfscript_regions = cfml_format.view.find_by_selector(','.join(non_indent_regions))
-    non_cfscript_lines = []
+    non_cfscript_regions = cfml_format.view.find_by_selector(non_script_selector)
+    non_indent_regions = cfml_format.view.find_by_selector(','.join(non_indent_selector))
+    non_cfscript_line_starts = set()
+    non_indent_line_starts = set()
+
     for r in non_cfscript_regions:
-        non_cfscript_lines.extend(cfml_format.view.split_by_newlines(r))
-    non_cfscript_line_starts = [r.begin() for r in non_cfscript_lines]
+        for l in cfml_format.view.split_by_newlines(r):
+            non_cfscript_line_starts.add(l.begin())
+
+    for r in non_indent_regions:
+        for l in cfml_format.view.split_by_newlines(r):
+            non_indent_line_starts.add(l.begin())
 
     lines = cfml_format.view.lines(cfml_format.region_to_format)
     base_indent_column = cfml_format.line_indent_column(lines[0].begin())
@@ -52,13 +60,19 @@ def indent_region(cfml_format):
                 indent_level += 1
         lines = lines[1:]
 
-    if lines[-1].end() > cfml_format.region_to_format.end():
+    if len(lines) > 0 and lines[-1].end() > cfml_format.region_to_format.end():
         lines = lines[:-1]
 
+    if len(lines) == 0:
+        return []
+
     for l in lines:
         full_line_str = cfml_format.view.substr(l)
         stripped_line_str = full_line_str.strip()
 
+        if l.begin() in non_cfscript_line_starts:
+            base_indent_column = cfml_format.line_indent_column(l.begin())
+
         if len(stripped_line_str) == 0:
             replacements.append(stripped_line_str)
             continue
@@ -103,7 +117,7 @@ def indent_region(cfml_format):
 
         indented_line = cfml_format.indent_to_column(indent_columns) + stripped_line_str
 
-        if l.begin() in non_cfscript_line_starts:
+        if l.begin() in non_cfscript_line_starts or l.begin() in non_indent_line_starts:
             replacements.append(full_line_str)
         else:
             replacements.append(indented_line)

src/formatting/cfml_format.py

@@ -92,27 +92,15 @@ def get_region_to_format(self, current_method):
             return self.view.sel()[0], True
         if current_method:
             pt = self.view.sel()[0].begin()
-            cfc_selector = 'source.cfml.script meta.class'
-            decl_selector = 'source.cfml.script meta.class.body.cfml meta.function.declaration.cfml'
-            body_selector = 'source.cfml.script meta.class.body.cfml meta.function.body.cfml'
-
-            in_cfc = self.view.match_selector(pt, cfc_selector)
-            in_funct_decl = self.view.match_selector(pt, decl_selector)
-            in_funct_body = self.view.match_selector(pt, body_selector)
-
-            if in_funct_decl or in_funct_body:
-                if in_funct_body:
-                    funct_body_region = utils.get_scope_region_containing_point(self.view, pt, body_selector)
-                    funct_decl_pt = funct_body_region.begin() - 1
-                    funct_decl_region = utils.get_scope_region_containing_point(self.view, funct_decl_pt, decl_selector)
-                else:
-                    funct_decl_region = utils.get_scope_region_containing_point(self.view, pt, decl_selector)
-                    funct_body_pt = funct_decl_region.end()
-                    funct_body_region = utils.get_scope_region_containing_point(self.view, funct_body_pt, body_selector)
-
-                function_region = sublime.Region(funct_decl_region.begin(), funct_body_region.end())
-                return function_region, False
-            if in_cfc:
+            cfc_selector = 'source.cfml meta.class'
+            funct_selector = 'source.cfml meta.class meta.function'
+
+            if self.view.match_selector(pt, funct_selector):
+                for function_region in self.view.find_by_selector(funct_selector):
+                    if function_region.contains(pt):
+                        return function_region, False
+
+            if self.view.match_selector(pt, cfc_selector):
                 return None, False
 
         return sublime.Region(0, self.view.size()), False

src/formatting/method_chains.py

@@ -40,7 +40,7 @@ def format_method_chains(cfml_format):
 
 def find_method_chains(cfml_format):
     method_chains = []
-    regions = cfml_format.find_by_selector('meta.function-call.method -meta.function-call.method.static')
+    regions = cfml_format.find_by_selector('source.cfml.script meta.function-call.method -meta.function-call.method.static')
 
     if len(regions) == 0:
         return method_chains