New approach to HTML completions in components

Removed `text.html.cfml` scope from within tag component functions and subclassed the default HTML completions class for completions there. This should help with #116.

Author: jcberquist

cfml_plugin.py

@@ -1,5 +1,6 @@
 import sublime
 import sublime_plugin
+from HTML.html_completions import HtmlTagCompletions
 from .src.bootstrap import *
 from .src.bootstrap import _plugin_loaded
 from .src import completions, events, utils
@@ -119,3 +120,24 @@ class CfmlEditSettingsCommand(sublime_plugin.WindowCommand):
     def run(self, file, default):
         package_file = file.replace("{cfml_package_name}", utils.get_plugin_name())
         self.window.run_command("edit_settings", {"base_file": package_file, "default": default})
+
+
+class CustomHtmlTagCompletions(HtmlTagCompletions):
+    '''
+    There is no text.html scope in <cffunction> bodies, so this
+    allows the HTML completions to still function there
+    '''
+
+    def on_query_completions(self, view, prefix, locations):
+        if not utils.get_setting("html_completions_in_tag_components"):
+            return None
+
+        # Only trigger within CFML tag component functions
+        selector = 'meta.class.body.tag.cfml meta.function.body.tag.cfml -source.cfml.script -source.sql'
+        if not view.match_selector(locations[0], selector):
+            return None
+
+        # check if we are inside a tag
+        is_inside_tag = view.match_selector(locations[0], 'meta.tag - punctuation.definition.tag.begin')
+
+        return self.get_completions(view, prefix, locations, is_inside_tag)

settings/cfml_package.sublime-settings

@@ -27,6 +27,9 @@
 	// e.g. myvar = new path.to.cfc();
 	"instantiated_component_completions": true,
 
+	// provide HTML completions in tag component functions
+	"html_completions_in_tag_components": true,
+
 	// if true, when a ">" is typed to end a tag the corresponding closing tag will be inserted	after the cursor position,
 	// except for the cfml tags listed in the "cfml_non_closing_tags" setting below
 	"cfml_auto_insert_closing_tag": false,

src/minihtml.py

@@ -94,7 +94,7 @@ def render_span(span, styles, style_map):
             span_html = "<em>" + span_html + "</em>"
 
         if span["style"]["bold"]:
-            span_html = "<stron>" + span_html + "</strong>"
+            span_html = "<strong>" + span_html + "</strong>"
 
         span_html = start_span + span_html + "</span>"
 

syntaxes/cfml.sublime-syntax

@@ -158,7 +158,7 @@ contexts:
         - match: '>'
           scope: punctuation.definition.tag.end.cfml
           set:
-            - meta_content_scope: meta.function.body.tag.cfml text.html.cfml
+            - meta_content_scope: meta.function.body.tag.cfml
             - include: cffunction-end-pop
             - include: html
         - match: (?i:\b(?:name)\b)
@@ -443,11 +443,10 @@ contexts:
         - match: '>'
           scope: punctuation.definition.tag.end.cfml
           set:
-            - clear_scopes: 1
             - meta_content_scope: source.cfml.script
             - match: (?i)(</)(cfscript)(>)
               captures:
-                0: text.html.cfml meta.tag.cfml
+                0: meta.tag.cfml
                 1: punctuation.definition.tag.begin.cfml
                 2: entity.name.tag.cfml
                 3: punctuation.definition.tag.end.cfml
@@ -459,14 +458,13 @@ contexts:
   tags-with-script:
     - match: (?i)(<)(cfset|cfreturn|cfif|cfelseif)\b
       captures:
-        0: text.html.cfml meta.tag.cfml
+        0: meta.tag.cfml
         1: punctuation.definition.tag.begin.cfml
         2: entity.name.tag.cfml
       push:
-        - clear_scopes: 1
         - meta_content_scope: meta.tag.cfml source.cfml.script
         - match: (/?>)
-          scope: text.html.cfml meta.tag.cfml punctuation.definition.tag.end.cfml
+          scope: meta.tag.cfml punctuation.definition.tag.end.cfml
           pop: true
         - match: \bvar\b
           scope: storage.type.cfml

syntaxes/src/cfml.sublime-syntax.yaml-macros

@@ -123,7 +123,7 @@ contexts:
         - match: '>'
           scope: punctuation.definition.tag.end.cfml
           set:
-            - meta_content_scope: meta.function.body.tag.cfml text.html.cfml
+            - meta_content_scope: meta.function.body.tag.cfml
             - include: cffunction-end-pop
             - include: html
         - !attribute
@@ -271,11 +271,10 @@ contexts:
         - match: '>'
           scope: punctuation.definition.tag.end.cfml
           set:
-            - clear_scopes: 1
             - meta_content_scope: source.cfml.script
             - match: (?i)(</)(cfscript)(>)
               captures:
-                0: text.html.cfml meta.tag.cfml
+                0: meta.tag.cfml
                 1: punctuation.definition.tag.begin.cfml
                 2: entity.name.tag.cfml
                 3: punctuation.definition.tag.end.cfml
@@ -287,14 +286,13 @@ contexts:
   tags-with-script:
     - match: (?i)(<)(cfset|cfreturn|cfif|cfelseif)\b
       captures:
-        0: text.html.cfml meta.tag.cfml
+        0: meta.tag.cfml
         1: punctuation.definition.tag.begin.cfml
         2: entity.name.tag.cfml
       push:
-        - clear_scopes: 1
         - meta_content_scope: meta.tag.cfml source.cfml.script
         - match: (/?>)
-          scope: text.html.cfml meta.tag.cfml punctuation.definition.tag.end.cfml
+          scope: meta.tag.cfml punctuation.definition.tag.end.cfml
           pop: true
         - match: \bvar\b
           scope: storage.type.cfml