I hope final

Author: mpourmpoulis

README.md

@@ -7,12 +7,12 @@
 PythonVoiceCodingPlugin is a Sublime Text 3 plugin meant to enhance user experience 
 when coding python 3 by voice. 
 
-![](doc/gif/big0.gif)
+![](doc/gif/big2.gif)
 
 ## Motivation
 
 The project was inspired by [Gustav Wengel's article](https://medium.com/bambuu/state-of-voice-coding-2017-3d2ff41c5015) on the state of voice coding  and my personal experiences
-with  [Caster](https://github.com/dictation-toolbox/Caster). Despite the excellent work put behind this trully awesome dragonfly based toolkit, I felt there were cases we could do slightly better:)
+with  [Caster](https://github.com/dictation-toolbox/Caster). Despite the excellent work put behind this trully awesome [dragonfly](https://github.com/t4ngo/dragonfly) based toolkit, I felt there were cases we could do slightly better:)
 
 In particular, navigation through the code sometimes felt a little bit too mechanistic. Say for instance you want to go to some location or select some text. For the most part ,you are  describing what actions 
 need to be taken to get there. What if you could instead simply describe (syntactically)  what you want to select? 
@@ -47,11 +47,14 @@ I want to be honest. This is not exactly the best code ever written. It is far f
 * is partly customizable. If you find yourself using certain commands with some given parameters often and want a shorthand smaller command, you can always follow my commented banana example:)
 
 
-As I said, far from perfect but nonetheless an out-of-the-box solution which I hope to be helpful ,especially for beginners to get up to speed , and a step towards the right direction. I hope you enjoy using it as much as I have enjoyed coding it:)
+As I said, far (really far) from perfect but nonetheless an out-of-the-box solution which I hope to be helpful ,especially for beginners to get up to speed , and a step towards the right direction. I hope you enjoy using it as much as I have enjoyed coding it:)
+
+Needless to say, while coding PythonVoiceCodingPlugin , PythonVoiceCodingPlugin was used :)
 
 ## Release and Version 
 
-Currently in preparation of the initial 0.0.0 release , probably between 5-10/11 :)
+The code is available on [github](https://github.com/mpourmpoulis/PythonVoiceCodingPlugin)
+along with its initial release (0.0.0)!
 
 
 
@@ -213,5 +216,5 @@ Many thanks to all of the developers that have put their time and effort behind
 * Caster
 
 
-needless to say, while coding PythonVoiceCodingPlugin I used PythonVoiceCodingPlugin :)
+
 

application/application.py

@@ -60,6 +60,7 @@ def respond_to_query(self,interface,query_description):
 				self.state["alternatives"] = alternatives
 				interface.push_action(DisplayRegionsAction("alternatives",alternatives,"Alternatives:\n"))
 				interface.push_action(HighlightCleverAction(alternatives,"alternatives",result))
+				
 		elif isinstance(s,InsertionQuery):
 			output = s.writing_locations_text
 			selections = s.optional_selection
@@ -81,6 +82,7 @@ def respond_to_query(self,interface,query_description):
 			if items:
 				interface.push_action(DisplayNiceAction(items,True))  
 				self.state["collection"] = items
+				self.history.append(("collect"))
 			if selections:
 				interface.push_action(SelectionAction(selections))
 

bundles/README.md

@@ -1,3 +1,5 @@
+# Grammar bundles
+
 This folder contains my grammar and other related stuff
 
 For the time being I only release bundles for Caster 0.5.11, these are in the Caster folder.

doc/README.md

@@ -4,16 +4,20 @@
 
 Here we will briefly go over the commands offered. 
 
-Before we get started, a small general remark: virtually every command starts with the keyword smart! 
-This was chosen in order to minimize chances of collision with other commands on your system. 
+Before we get started, a small general remark: 
+```
+tip: if you do not know what to say, say smart :P
+```
+
+because virtually every command starts with the keyword smart! 
 
 ```python
 "smart <big_roi> [<big_roi_sub_index>]"
 
 "smart <color> [alternative]"
 ```
 
-however, because for a variety of commands, ommitting the keyword smart makes them more convenient and easier to speak
+This was chosen in order to minimize chances of collision with other commands on your system. However, because for a variety of commands, ommitting the keyword smart makes them more convenient and easier to speak
 you may find the smart keyword in brackets
 
 ```python
@@ -24,7 +28,7 @@ you may find the smart keyword in brackets
 "[smart] paste <color> back"
 ```
 
-if there are conflicts with other commands, trying to remove those brackets. furthermore, I I think it is best not to put brackets in cases where I haven't.  
+if there are conflicts with other commands, try to remove those brackets (making smart not optional). Furthermore, I I think it is best not to put brackets in cases where I haven't.  
 
 After the small remark let's get started!
 
@@ -79,6 +83,8 @@ usually followed by an integer. Beware the difference between up and above! As a
 
 ![](./gif/arg5.gif)
 
+
+
 * in certain cases you can combine these two approaches:)
 
 ![](./gif/big5.gif)

doc/SelectBigROI.md

@@ -2,7 +2,7 @@
 
 These commands are responsible for selecting "big" regions of interest. By "big" we refer to things like "if condition" or "assignment right" in contrast to say the first entry of a dictionary.
 
-![](./gif/big0.gif)
+![](./gif/big2.gif)
 
 
 In particular, the currently offered "big roi´s" are :

library/BracketMatcher.py

@@ -3,7 +3,7 @@
 import token
 
 from PythonVoiceCodingPlugin.third_party.astmonkey import transformers
-from PythonVoiceCodingPlugin.third_party.asttokens import asttokens as asttokens  
+from PythonVoiceCodingPlugin.third_party.asttokens import asttokens  
 
 from PythonVoiceCodingPlugin.library import build_tree,get_source_region,nearest_node_from_offset,previous_token,next_token
 
@@ -52,8 +52,6 @@ def _match(self,atok):
 					self.level_index[index] = []  
 				self.level[index].append((c,candidate))
 				self.level_index[index].append(c.start)
-			# print(candidate,stack,"sicklep")
-		# print(" leaving mods all brackets")
 
 
 

library/LCA.py

@@ -48,13 +48,9 @@ def __call__(self,first_node,second_node,include_depth = False):
 
 	def get_field_with_respect_to(self,node,parent_node):
 		index = bisect.bisect_left(self.field_history[parent_node],(self.visits[node][0],))
-		# print(" initial index ease",index)
 		index = index if index < len(self.field_history[parent_node])  and \
 				self.field_history[parent_node][index][0] == self.visits[node][0] else index-1 
-		# print("LCA",self.field_history[parent_node],parent_node, index,self.visits[node][0],
-		# 	self.field_history[parent_node][index][0] == self.visits[node][0],"\n")
 		y = self.field_history[parent_node][index]
-		# print("LCA returning ",y[1],y[2],"\n")
 		return (y[1],y[2])
 
 	def visit_time(self, node):

library/__init__.py

@@ -2,7 +2,7 @@
 from itertools import chain
 
 from PythonVoiceCodingPlugin.third_party.astmonkey import transformers
-from PythonVoiceCodingPlugin.third_party.asttokens import asttokens as asttokens  
+from PythonVoiceCodingPlugin.third_party.asttokens import asttokens  
 
 def make_flat(x):
 	return list(chain.from_iterable(x))

library/higher.py

@@ -1,7 +1,7 @@
 import ast
 import token
 
-from PythonVoiceCodingPlugin.third_party.asttokens import asttokens as asttokens
+from PythonVoiceCodingPlugin.third_party.asttokens import asttokens
 
 from PythonVoiceCodingPlugin.library import previous_token,next_token
 from PythonVoiceCodingPlugin.library.modification import ModificationHandler
@@ -12,41 +12,36 @@
 
 def filter_asynchronous(atok,m = None, timestamp  = 0):
 	m = m if m else ModificationHandler(atok.text)
-	candidates = [x  for x in atok.tokens  if x.type== 52 and x.string=="async"]
+	candidates = [x  for x in atok.tokens  if x.string=="async"]
 	for c in candidates:
-		y = next_token(c)
+		y = next_token(atok,c)
 		# async_stmt: 'async' (funcdef | with_stmt | for_stmt)
-		if y and y.type==52 and y.string in ["def","for","with"]:
+		if y  and y.string in ["def","for","with"]:
 			m.modify_from(timestamp,(c.startpos,y.startpos),"","async_"+y.string)
 	return m
 
 
 def filter_await(atok,m = None, timestamp  = 0):
 	m = m if m else ModificationHandler(atok.text)
-	candidates = [x  for x in atok.tokens  if x.type== 52 and x.string=="await"]
+	candidates = [x  for x in atok.tokens  if  x.string=="await"]
 	for c in candidates:
 		m.modify_from(timestamp,(c.startpos,c.endpos),"yield from","await")
 	return m
 
 def filter_fstrings(atok,m = None, timestamp = 0):
 	m = m if m else ModificationHandler(atok.text)
-	candidates = [x  for x in atok.tokens  if x.type== 52 and x.string=="f"]
+	candidates = [x  for x in atok.tokens  if x.string=="f"]
 	for c in candidates:
-		y = next_token(c)
+		y = next_token(atok,c)
 		if y and y.type==token.STRING:
-			m.modify_from(timestamp,(c.startpos,c.endpos),"","fstring")
+			m.modify_from(timestamp,(c.startpos,y.endpos),y.string,"fstring")
 	return m
 
 def filter_everything(atok, m = None, timestamp = 0):
-	print(m)
 	m = m if m else ModificationHandler(atok.text)
-	print(" inside everything after initialization",m)
 	m = filter_asynchronous(atok,m, timestamp)
-	print("1",m)
 	m = filter_fstrings(atok,m,  timestamp)
-	print("2",m)
 	m = filter_await(atok,m, timestamp)
-	print(m)
 	return m
 
 

library/info.py

@@ -117,6 +117,11 @@ def get_elif_condition(root):
 		else None		
 	)
 
+def get_comprehension_condition(root):
+	return (
+		root.ifs  if match_node(root,(ast.comprehension)) else None		
+	)
+
 def get_return_value(root):
 	return (
 		root.value if match_node(root,(ast.Return, ast.Yield,ast.YieldFrom )) else None