python

Author: AndreasArvidsson

data/fixtures/scopes/python/branch.if.elif.else.scope

@@ -0,0 +1,57 @@
+if True:
+    pass
+elif False:
+    pass
+else:
+    pass
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-1:8
+  >--------
+0| if True:
+1|     pass
+   --------<
+
+[#1 Removal] = 0:0-2:2
+  >--------
+0| if True:
+1|     pass
+2| elif False:
+   --<
+
+[#1 Insertion delimiter] = "\n"
+
+
+[#2 Content] =
+[#2 Domain] = 2:0-3:8
+  >-----------
+2| elif False:
+3|     pass
+   --------<
+
+[#2 Removal] = 2:0-4:0
+  >-----------
+2| elif False:
+3|     pass
+4| else:
+   <
+
+[#2 Insertion delimiter] = "\n"
+
+
+[#3 Content] =
+[#3 Domain] = 4:0-5:8
+  >-----
+4| else:
+5|     pass
+   --------<
+
+[#3 Removal] = 3:8-5:8
+          >
+3|     pass
+4| else:
+5|     pass
+   --------<
+
+[#3 Insertion delimiter] = "\n"

queries/python.scm

@@ -18,7 +18,6 @@
   (function_definition)
   (future_import_statement)
   (global_statement)
-  (if_statement)
   (import_from_statement)
   (import_statement)
   (match_statement)
@@ -30,6 +29,8 @@
   (try_statement)
   (while_statement)
   (with_statement)
+  ;; Disabled on purpose. We have a better definition of this below.
+  ;; (if_statement)
 ] @statement
 
 ;;!! a = 25
@@ -395,10 +396,6 @@
   ")" @value.iteration.end.startOf @name.iteration.end.startOf @type.iteration.end.startOf
 )
 
-;;!! if true: pass
-;;!  ^^^^^^^^^^^^^
-(if_statement) @ifStatement
-
 ;;!! foo()
 ;;!  ^^^^^
 (call) @functionCall
@@ -507,11 +504,34 @@
   (#not-parent-type? @_.removal case_clause)
 ) @_.domain
 
+;;!! if true: pass else: pass
+;;!  ^^^^^^^^^^^^^^^^^^^^^^^^
+(if_statement) @ifStatement @statement @branch.iteration
+
+;;!! if True: pass
+;;!  ^^^^^^^^^^^^^
+(if_statement
+  "if" @interior.domain.start
+  consequence: (_) @interior @interior.domain.end
+)
+
 ;;!! if True: pass
 ;;!  ^^^^^^^^^^^^^
 (if_statement
-  "if" @branch.start @interior.domain.start
-  consequence: (_) @branch.end @interior @interior.domain.end
+  "if" @branch.start @branch.removal.start
+  consequence: (_) @branch.end @branch.removal.end
+  alternative: (else_clause)? @branch.removal.end.startOf
+)
+
+;;!! if True: pass elif False: pass
+;;!  ^^^^^^^^^^^^^
+(if_statement
+  "if" @branch.start @branch.removal.start
+  consequence: (_) @branch.end @branch.removal.end
+  alternative: (elif_clause
+    "elif" @branch.removal.end.startOf
+    (#character-range! @branch.removal.end.startOf 2)
+  )
 )
 
 ;;!! elif True: pass
@@ -526,8 +546,6 @@
   body: (_) @interior
 ) @branch @interior.domain
 
-(if_statement) @branch.iteration
-
 ;;!! try: pass
 ;;!  ^^^^^^^^^
 (try_statement