Type fixes

Author: wende

lib/alchemide/autocompleter/autocomplete.exs

@@ -1,5 +1,21 @@
 spec_to_ast = fn a,b -> Kernel.Typespec.spec_to_ast(a,b) end
 
+y = fn f ->
+  fn x ->
+    f.(fn y -> (x.(x)).(y) end)
+  end.(fn x ->
+    f.(fn y -> (x.(x)).(y) end)
+  end)
+end
+
+
+replaceTypeGen = fn replaceType ->
+  fn
+    [{spec} | specs], types  ->
+    []
+  end
+end
+
 zipFunSpec = fn
   (a, nil) -> a
   (a, []) -> a
@@ -30,7 +46,7 @@ pairWithSpec = fn input, fns ->
   case String.contains?(input, ".") do
     true ->
       mod = Regex.replace ~r/\.\w*$/, input, ""
-      {atom, _} = Code.eval_string("List")
+      {atom, _} = Code.eval_string(mod)
       specMap = getSpec.(atom)
       re = ~r/\/\d+\s*$/
       Enum.map(fns, fn a ->
@@ -69,7 +85,7 @@ execute = fn
   ("a", input) ->
     {exists, one, multi} = IEx.Autocomplete.expand(Enum.reverse(to_char_list(input)))
     {exists, one, pairWithSpec.(input, multi)}
-  ("s", input) -> getSpec.(String.to_atom("Elixir." <> input))
+  ("s", input) -> {"True", "" , Map.to_list getSpec.(String.to_atom("Elixir." <> input))}
 end
 
 loop = fn(y) ->

lib/alchemide/typer/lib/typer.ex

@@ -1,17 +1,23 @@
 defmodule Typer do
-  def getSpec(module) do
-    mapper = fn {{name, _arity}, types} ->
-      specs = types
-      |> Enum.map(&(Kernel.Typespec.spec_to_ast.(name, &1)))
-      |> Enum.map(&Macro.to_string/1)
-      {Atom.to_string(name), specs}
-    end
-    reducer = fn {k, v}, acc ->
-      Dict.put(acc,k,v)
-    end
 
-    Kernel.Typespec.beam_specs(module)
-    |> Enum.map(mapper)
-    |> Enum.reduce(%{}, reducer)
+  def get_type({op,ctx,args}) when is_atom(op) and is_list(ctx) and is_list(args) do
+
   end
+  def get_type(a) when is_atom(a) ,                     do: :'atom()'
+  def get_type(a) when is_binary(a) ,                   do: :'binary()'
+  def get_type(a) when is_bitstring(a) ,                do: :'bitstring()'
+  def get_type(a) when is_boolean(a) ,                  do: :'boolean()'
+  def get_type(a) when is_float(a) ,                    do: :'float()'
+  def get_type(a) when is_integer(a) ,                  do: :'integer()'
+  def get_type(a) when is_list(a) ,                     do: :'list()'
+  def get_type(a) when is_map(a) ,                      do: :'map()'
+  def get_type(a) when is_nil(a) ,                      do: :'nil'
+  def get_type(a) when is_number(a) ,                   do: :'number()'
+  def get_type(a) when is_pid(a) ,                      do: :'pid()'
+  def get_type(a) when is_port(a) ,                     do: :'port()'
+  def get_type(a) when is_reference(a) ,                do: :'reference()'
+  def get_type(a) when is_tuple(a) ,                    do: :'tuple()'
+  def get_type(a) when is_function(a) ,                 do: :'function()'
+  def get_type(_),                                      do: :'any()'
+  
 end

lib/alchemide/typer/test/typer_test.exs

@@ -4,7 +4,13 @@ defmodule TyperTest do
   test "the truth" do
     assert 1 + 1 == 2
   end
-  test "expression value" do
-    assert Typer.
+  test "simple expression value" do
+    assert Typer.get_type(s_to_ast("1")) == :'integer()'
+    assert Typer.get_type(s_to_ast(":atom")) == :'atom()'
+  end
+
+  def s_to_ast(string) do
+    {:ok, ast} = Code.string_to_quoted(string)
+    ast
   end
 end

lib/autocomplete-elixir-client.coffee

@@ -13,7 +13,7 @@ class RsenseClient
       editor.onDidSave (e) ->
         autocomplete.loadFile(e.path)
 
-  checkCompletion: (editor, buffer, row, column, prefix, callback) ->
+  checkCompletion: (prefix, callback) ->
     #console.log "Prefix: #{prefix}"
     autocomplete.getAutocompletion prefix, (result) ->
       #console.log result

lib/autocomplete-elixir-provider.coffee

@@ -10,19 +10,18 @@ class RsenseProvider
     @rsenseClient = new RsenseClient()
 
 
-  requestHandler: (options) ->
+  getSuggestions: (request) ->
     return new Promise (resolve) =>
-      row = options.cursor.getBufferRow()
-      col = options.cursor.getBufferColumn()
+      row = request.bufferPosition.row
+      col = request.bufferPosition.column
 
-      prefix = options.editor.getTextInBufferRange([[row ,0],[row, col]])
+      prefix = request.editor.getTextInBufferRange([[row ,0],[row, col]])
       [... , prefix] = prefix.split(/[ ()]/)
       unless prefix then resolve([])
-      options.prefix = prefix
 
-      completions = @rsenseClient.checkCompletion(options.editor,
-      options.buffer, row, col, options.prefix, (completions) =>
-        suggestions = @findSuggestions(options.prefix, completions)
+      completions = @rsenseClient.checkCompletion(prefix, (completions) =>
+        suggestions = @findSuggestions(prefix, completions)
+        console.log suggestions
         return resolve() unless suggestions?.length
         return resolve(suggestions)
       )
@@ -35,8 +34,8 @@ class RsenseProvider
         [word, spec] = completion.name.trim().split("@")
         argTypes = null
         ret = null;
-        if !word || !word[0] then continue 
-        if word[0] == word[0].toUpperCase() then ret = "Module"
+        if !word || !word[0] then continue
+        if word[0] == word[0].toUpperCase() then [ret,isModule] = ["Module",true]
         label = completion.spec
         if spec
           specs = spec.replace(/^\w+/,"")
@@ -61,6 +60,12 @@ class RsenseProvider
           snippet:  if one then prefix + word else word
           prefix:  if one then prefix else last
           label: if ret then ret else "any"
+          type: if module then "method" else
+                if func then "function" else
+                "variable"
+          description: spec || ret
+          excludeLowerPriority: true
+
         suggestions.push(suggestion)
       return suggestions
     return []

lib/autocomplete-elixir.coffee

@@ -15,7 +15,7 @@ module.exports =
     @rsenseProvider = new RsenseProvider()
 
   provideAutocompletion: ->
-    {providers: [@rsenseProvider]}
+    [@rsenseProvider]
 
   deactivate: ->
     @rsenseProvider?.dispose()

package.json

@@ -35,7 +35,7 @@
     "autocomplete.provider": {
       "description": "Intelligent Elixir code completion",
       "versions": {
-        "1.1.0": "provideAutocompletion"
+        "2.0.0": "provideAutocompletion"
       }
     }
   },