Migrated zen syntax test to tea_actions; added syntax-awareness to Wr…

…ap With Abbreviation

src/Support/Library/tea_actions.py

@@ -6,6 +6,7 @@
 from Foundation import *
 
 import html_replace
+from zencoding import html_matcher as html_matcher
 
 # ===============================================================
 # Interact with the user and output information
@@ -407,6 +408,41 @@ def indent_snippet(context, snippet, range):
                     snippet += current_indent
     return snippet
 
+# ===============================================================
+# Check document syntax methods
+# ===============================================================
+
+def get_zen_doctype(context, default='html'):
+    '''
+    Tests the document to see if it is CSS or XSL; for use with zen
+    coding actions to determine type of snippets to use
+    '''
+    doc_type = default
+    css_exts = ['css', 'less']
+    xsl_exts = ['xsl', 'xslt']
+    path = context.path()
+    if path is not None:
+        pos = path.rfind('.')
+        if pos != -1:
+            pos += 1
+            ext = path[pos:]
+            if ext in css_exts:
+                doc_type = 'css'
+            elif ext in xsl_exts:
+                doc_type = 'xsl'
+    # No luck with the extension; check for inline style tags
+    if doc_type == 'html':
+        range = get_range(context)
+        cursor = range.location + range.length
+        content = context.string()
+        start, end = html_matcher.match(content, cursor)
+        tag = html_matcher.last_match['opening_tag']
+        if tag is not None:
+            tag = tag.name
+            if tag == 'style':
+                doc_type = 'css'
+    return doc_type
+
 # ===============================================================
 # Insertion methods
 # ===============================================================

src/Support/Scripts/TEASnippetWithWord.py

@@ -5,7 +5,6 @@
 import tea_actions as tea
 from zencoding import zen_core, settings_loader
 from zencoding.zen_settings import zen_settings
-from zencoding import html_matcher as html_matcher
 
 def act(controller, bundle, options):
     context = tea.get_context(controller)
@@ -55,30 +54,7 @@ def place_ins_point(text):
         zen_core.insertion_point = place_ins_point
 
         # Determine doctype as best we can based on file extension
-        doc_type = 'html'
-        css_exts = ['css', 'less']
-        xsl_exts = ['xsl', 'xslt']
-        path = context.path()
-        if path is not None:
-            pos = path.rfind('.')
-            if pos != -1:
-                pos += 1
-                ext = path[pos:]
-                if ext in css_exts:
-                    doc_type = 'css'
-                elif ext in xsl_exts:
-                    doc_type = 'xsl'
-        # No luck with the extension; check for inline style tags
-        if doc_type == 'html':
-            range = tea.get_range(context)
-            cursor = range.location + range.length
-            content = context.string()
-            start, end = html_matcher.match(content, cursor)
-            tag = html_matcher.last_match['opening_tag']
-            if tag is not None:
-                tag = tag.name
-                if tag == 'style':
-                    doc_type = 'css'
+        doc_type = tea.get_zen_doctype(context)
 
         # Prepare the snippet
         snippet = zen_core.expand_abbreviation(fullword, doc_type, 'xhtml')

src/Support/Scripts/TEAWrapWithAbbreviation.py

@@ -79,8 +79,8 @@ def is_space(char):
             rng = tea.new_range(start, end - start)
             text = tea.get_selection(context, rng)
 
-        # NEED A WAY TO DETECT DOCUMENT TYPE
-        doc_type = 'html'
+        # Fetch the doctype based on file extension
+        doc_type = tea.get_zen_doctype(context)
 
         text = self.unindent(context, text)