Use expression completion for watch and set

autoload/vimspector.vim

@@ -235,7 +235,9 @@ function! vimspector#AddWatch( ... ) abort
     return
   endif
   if a:0 == 0
-    let expr = input( 'Enter watch expression: ' )
+    let expr = input( 'Enter watch expression: ',
+                    \ '',
+                    \ 'custom,vimspector#CompleteExpr' )
   else
     let expr = a:1
   endif

python3/vimspector/utils.py

@@ -356,16 +356,21 @@ def SelectFromList( prompt, options ):
       return None
 
 
-def AskForInput( prompt, default_value = None ):
+def AskForInput( prompt, default_value = None, completion = None ):
   if default_value is None:
-    default_option = ''
+    default_value = ''
-  else:
+
-    default_option = ", '{}'".format( Escape( default_value ) )
+  args = [ prompt, default_value ]
+
+  if completion is not None:
+    if completion == 'expr':
+      args.append( 'custom,vimspector#CompleteExpr' )
+    else:
+      args.append( completion )
 
   with InputSave():
     try:
-      return vim.eval( "input( '{}' {} )".format( Escape( prompt ),
+      return Call( 'input', *args )
-                                                  default_option ) )
     except ( KeyboardInterrupt, vim.error ):
       return None
 

python3/vimspector/variables.py

@@ -533,7 +533,8 @@ class VariablesView( object ):
       return
 
     new_value = utils.AskForInput( 'New Value: ',
-                                   variable.variable.get( 'value', '' ) )
+                                   variable.variable.get( 'value', '' ),
+                                   completion = 'expr' )
 
     if new_value is None:
       return