ptweir · akdor1154 · Mar 13, 2021 · Mar 13, 2021 · Mar 13, 2021 · cikay
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Install `python-string-sql` from extensions (`ctrl + shift + x` or `cmd + shift

 ## Usage

-Insert `--sql`, `--beginsql`, or `--begin-sql` at the beginning of the part of the string you would like highlighted and a semicolon, `--endsql`, or `--end-sql` at the end of the highlighted section.
+In a `""" multi-line """` or `f""" f-string multiline """` string, use a `select`, `with`, or `-- sql-comment`, and the string will then be treated as embedded SQL.

 ### Snippets
 begin typing `sql` and the autocomplete snippet will appear:
@@ -25,7 +25,6 @@ begin typing `sql` and the autocomplete snippet will appear:
 cmd+s (or ctrl+s on mac) - Insert the following snippet:
 ```
 """
--sql
 SELECT
 ;
 """

diff --git a/docs/demo.png b/docs/demo.png
diff --git a/docs/demo.py b/docs/demo.py
@@ -4,7 +4,6 @@
 cur = conn.cursor()

 query = """
--begin-sql
 SELECT last_name,
    start_day,
    COUNT(*) AS num_entries

diff --git a/snippets/python.json b/snippets/python.json
@@ -3,7 +3,6 @@
 	    "prefix": "sql",
 	    "body": [
            "\"\"\"",
-            "--sql",
            "${1| ,SELECT,WITH|}",
            ";",
            "\"\"\""

diff --git a/syntaxes/highlight-sql-string.json b/syntaxes/highlight-sql-string.json
@@ -5,19 +5,17 @@
  "injectionSelector": "L:string.quoted.multi.python, L:meta.fstring.python - (comment.line.number-sign.python, punctuation.definition.comment.python)",
  "patterns": [
    {
-      "begin": "( *--sql| *--beginsql| *--begin-sql)",
-      "end": "( *;| *--endsql| *--end-sql)",
-      "captures": {
-        "1": {
-          "name": "variable.parameter"
-        }
+      "name": "meta.embedded.sql",
+      "begin": "\\s*((?i)(select|with)|(--.*))",
+      "end": "(?=\"\"\")",
+      "beginCaptures": {
+        "2": { "name": "keyword.other.DML.sql" },
+        "3": { "name": "comment.line.double-dash.sql" }
      },
      "patterns": [
-        {
-          "include": "source.sql"
-        }
+        { "include": "source.sql" }
      ]
    }
  ],
  "scopeName": "python-sql.injection"
-}
+}
-Original file line number
+Diff line change
@@ -5,19 +5,17 @@
       "injectionSelector": "L:string.quoted.multi.python, L:meta.fstring.python - (comment.line.number-sign.python, punctuation.definition.comment.python)",
       "patterns": [
         {
-          "begin": "( *--sql| *--beginsql| *--begin-sql)",
         Comment thread


        

        
      

        
          


  
    
        
        
  
    
      
          
    
  


        
            
  
      
              Copy link

  
              
  
      
                Copy Markdown

  
        
      
    

    
        



        

    
  

  
    
      
          
      

      
            cikay
  

      

      

      


        Nov 16, 2021



      
  •

  
    
      
        
          edited
          
        
        
      
    
    
      
  
        
      Loading


  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  
    
  


    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I do not recommend to remove the current identifiers. It would break all implementation. Add new ones but do not remove the current ones.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    


      



    
        
  
    
      
          
    
  


        
            
  
      
              Copy link

  
              
  
      
                Copy Markdown

  
        
      
    

    
        



        

  Author


    
  

  
    
      
          
      

      
            akdor1154
  

      

      

      


        Nov 17, 2021



      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Sure, thanks for getting to this :)
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    


      



    
        
  
    
      
          
    
  


        
            
  
      
              Copy link

  
              
  
      
                Copy Markdown

  
        
      
    

    
        



        

  Author


    
  

  
    
      
          
      

      
            akdor1154
  

      

      

      


        Nov 17, 2021



      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Ah, you are not maintainer haha. You're probably right but ill wait to hear from repo owner/member if they are still alive...
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
-          "end": "( *;| *--endsql| *--end-sql)",
-          "captures": {
-            "1": {
-              "name": "variable.parameter"
-            }
+          "name": "meta.embedded.sql",
+          "begin": "\\s*((?i)(select|with)|(--.*))",
+          "end": "(?=\"\"\")",
+          "beginCaptures": {
+            "2": { "name": "keyword.other.DML.sql" },
+            "3": { "name": "comment.line.double-dash.sql" }
           },
           "patterns": [
-            {
-              "include": "source.sql"
-            }
+            { "include": "source.sql" }
           ]
         }
       ],
       "scopeName": "python-sql.injection"
-    }
+    }