Merge pull request JunoLab#713 from JunoLab/avi/fuzzycompletionmode

fuzzy completion mode

Author: pfitzseb

lib/package/config.coffee

@@ -83,11 +83,23 @@ config =
         type: 'string'
         default: ''
         order: 9
+      fuzzyCompletionMode:
+        title: 'Fuzzy Completion Mode'
+        description:
+          '''
+          If `true`, in-editor auto-completions are generated based on fuzzy (i.e. more permissive) matches,
+          otherwise based on strict matches as in REPL.
+          ***NOTE***: this setting doesn't affect completions in REPL,
+          and so in-REPL completions will still work as usual (i.e. based on strict matches and will complete eagerly).
+          '''
+        type: 'boolean'
+        default: true
+        order: 10
       autoCompletionSuggestionPriority:
         title: 'Auto-Completion Suggestion Priority'
         description:
           '''
-          Specify the sort order of Auto-completion suggestions provided by Juno.
+          Specify the sort order of auto-completion suggestions provided by Juno.
           Note the default providers like snippets have priority of `1`.
           Requires Atom restart to take an effect.
           '''

lib/runtime.coffee

@@ -1,34 +1,36 @@
 { CompositeDisposable, Disposable } = require 'atom'
 
 module.exports =
-  modules:    require './runtime/modules'
-  evaluation: require './runtime/evaluation'
-  console:    require './runtime/console'
-  workspace:  require './runtime/workspace'
-  plots:      require './runtime/plots'
-  frontend:   require './runtime/frontend'
-  debugger:   require './runtime/debugger'
-  profiler:   require './runtime/profiler'
-  outline:    require './runtime/outline'
-  linter:     require './runtime/linter'
-  packages:   require './runtime/packages'
-  debuginfo:  require './runtime/debuginfo'
-  formatter:  require './runtime/formatter'
-  goto:       require './runtime/goto'
+  modules:     require './runtime/modules'
+  evaluation:  require './runtime/evaluation'
+  console:     require './runtime/console'
+  completions: require './runtime/completions'
+  workspace:   require './runtime/workspace'
+  plots:       require './runtime/plots'
+  frontend:    require './runtime/frontend'
+  debugger:    require './runtime/debugger'
+  profiler:    require './runtime/profiler'
+  outline:     require './runtime/outline'
+  linter:      require './runtime/linter'
+  packages:    require './runtime/packages'
+  debuginfo:   require './runtime/debuginfo'
+  formatter:   require './runtime/formatter'
+  goto:        require './runtime/goto'
 
   activate: ->
     @subs = new CompositeDisposable()
+
     @modules.activate()
+    @completions.activate()
     @frontend.activate()
-
     @subs.add atom.config.observe 'julia-client.juliaOptions.formatOnSave', (val) =>
       if val
         @formatter.activate()
       else
         @formatter.deactivate()
 
     @subs.add new Disposable(=>
-      mod.deactivate() for mod in [@modules, @frontend, @formatter])
+      mod.deactivate() for mod in [@modules, @completions, @frontend, @formatter])
 
   deactivate: ->
     @subs.dispose()
@@ -44,8 +46,7 @@ module.exports =
     @subs.add new Disposable(=>
       mod.deactivate() for mod in [@console, @debugger, @profiler, @linter, @goto, @outline])
 
-  provideAutoComplete: ->
-    require './runtime/completions'
+  provideAutoComplete: -> @completions
 
   provideHyperclick: -> @goto.provideHyperclick()
 

lib/runtime/completions.js

@@ -5,15 +5,15 @@
  * @TODO: Complete quotes for strings
  */
 
-import { Point, Range } from 'atom'
+import { CompositeDisposable, Point, Range } from 'atom'
 
 import { client } from '../connection'
 import modules from './modules'
 
 import { getLocalContext } from '../misc/blocks'
 
 const bracketScope = 'meta.bracket.julia'
-const completions = client.import('completions')
+const baselineCompletionAdapter = client.import('completions')
 const completionDetail = client.import('completiondetail')
 
 class AutoCompleteProvider {
@@ -24,6 +24,22 @@ class AutoCompleteProvider {
   suggestionPriority = atom.config.get('julia-client.juliaOptions.autoCompletionSuggestionPriority')
   filterSuggestions = false
 
+  activate () {
+    this.subscriptions = new CompositeDisposable()
+    this.subscriptions.add(
+      atom.config.observe('julia-client.juliaOptions.fuzzyCompletionMode', v => {
+        this.fuzzyCompletionMode = v
+      }),
+      atom.config.observe('julia-client.juliaOptions.noAutoParenthesis', v => {
+        this.noAutoParenthesis = v
+      })
+    )
+  }
+
+  deactivate () {
+    this.subscriptions.dispose()
+  }
+
   getSuggestions (data) {
     if (!client.isActive()) return []
     const { editor, bufferPosition, activatedManually } = data
@@ -57,8 +73,7 @@ class AutoCompleteProvider {
   baselineCompletions (data, line) {
     const { editor, bufferPosition: { row, column }, activatedManually } = data
     const { context, startRow } = getLocalContext(editor, row)
-
-    return completions({
+    return baselineCompletionAdapter({
       // general
       line,
       path: editor.getPath(),
@@ -69,6 +84,7 @@ class AutoCompleteProvider {
       startRow,
       column: column + 1,
       // configurations
+      is_fuzzy: this.fuzzyCompletionMode,
       force: activatedManually || false,
     }).then(completions => {
       return completions.map(completion => {
@@ -119,7 +135,7 @@ class AutoCompleteProvider {
   }
 
   onDidInsertSuggestion ({ editor, suggestion: { type } }) {
-    if (type !== 'function' || atom.config.get('julia-client.juliaOptions.noAutoParenthesis')) return
+    if (type !== 'function' || this.noAutoParenthesis) return
     editor.mutateSelectedText(selection => {
       if (!selection.isEmpty()) return
       const { row, column } = selection.getBufferRange().start