Fix all remaining xref issues

filmor · Oct 1, 2021 · 4515172 · 4515172
1 parent 9fc262e
commit 4515172
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 23 deletions.
diff --git a/apps/ierl/src/ierl_backend_elixir.erl b/apps/ierl/src/ierl_backend_elixir.erl
@@ -1,5 +1,17 @@
 -module(ierl_backend_elixir).
 
+% Ignore all Elixir functions as xref has no way to find out about them
+-ignore_xref([
+ {'Elixir.IEx.Autocomplete', expand, 1},
+ {'Elixir.Exception', format, 2},
+ {'Elixir.Exception', message, 1},
+ {'Elixir.Exception', normalize, 2},
+ {'Elixir.Kernel', inspect, 1},
+ {'Elixir.Code', string_to_quoted, 1},
+ {'Elixir.Code', 'string_to_quoted!', 1},
+ {'Elixir.Code', eval_string, 2}
+]).
+
 -behaviour(jup_kernel_backend).
 
 -export([
@@ -32,7 +44,7 @@ opt_spec() ->
  }.
 
 language() ->
- elixir.
+ <<"elixir">>.
 
 init(Args) ->
  case code:ensure_loaded(elixir) of

diff --git a/apps/ierl/src/ierl_backend_erlang.erl b/apps/ierl/src/ierl_backend_erlang.erl
@@ -4,6 +4,7 @@
 
 -export([
  init/1,
+ language/0,
  deps/0,
  opt_spec/0,
 
@@ -28,6 +29,9 @@ opt_spec() ->
  []
  }.
 
+language() ->
+ <<"erlang">>.
+
 init(_Args) ->
  #state{
  bindings = erl_eval:new_bindings(),

diff --git a/apps/ierl/src/ierl_backend_lfe.erl b/apps/ierl/src/ierl_backend_lfe.erl
@@ -28,7 +28,7 @@ opt_spec() ->
  }.
 
 language() ->
- 'common-lisp'.
+ <<"common-lisp">>.
 
 init(_Args) ->
  {ok, _} = application:ensure_all_started(lfe),

diff --git a/apps/ierl/src/ierl_cmd.erl b/apps/ierl/src/ierl_cmd.erl
@@ -0,0 +1,4 @@
+-module(ierl_cmd).
+
+-callback exec(_, _, _, _) -> _.
+-callback opt_spec() -> _.
diff --git a/apps/ierl/src/ierl_kernelspec.erl b/apps/ierl/src/ierl_kernelspec.erl
@@ -64,12 +64,7 @@ create(Options) ->
  Spec = #{
  argv => Argv1,
  display_name => jup_util:ensure_binary(DisplayName),
- language => jup_util:call_if_exported(
- BackendModule,
- language,
- [],
- erlang
- ),
+ language => BackendModule:language(),
  interrupt_mode => <<"message">>,
  env => Env
  },

diff --git a/apps/ierl/src/ierl_util.erl b/apps/ierl/src/ierl_util.erl
@@ -1,13 +1,13 @@
 -module(ierl_util).
 
--export(
- [
- get_app_version/1,
-  simplify/1,
-  format_args/1,
-  find_span/2
- ]
-).
+% Not used right now, but may be again in the future
+-ignore_xref([get_app_version/1]).
+-export([
+ get_app_version/1,
+ simplify/1,
+ format_args/1,
+ find_span/2
+]).
 
 -spec get_app_version(atom()) -> string().
 get_app_version(Name) ->

diff --git a/apps/ierl/src/mochitemp.erl b/apps/ierl/src/mochitemp.erl
@@ -22,9 +22,19 @@
 %% @doc Create temporary files and directories.
 
 -module(mochitemp).
--export([gettempdir/0]).
--export([mkdtemp/0, mkdtemp/3]).
--export([rmtempdir/1]).
+
+-ignore_xref([
+ gettempdir/0,
+ mkdtemp/0,
+ mkdtemp/3,
+ rmtempdir/1
+]).
+-export([
+ gettempdir/0,
+ mkdtemp/0,
+ mkdtemp/3,
+ rmtempdir/1
+]).
 %% -export([mkstemp/4]).
 -define(SAFE_CHARS, {
  $a,

diff --git a/apps/jupyter/src/internal.hrl b/apps/jupyter/src/internal.hrl
@@ -2,7 +2,7 @@
 -define(JUPYTER_INTERNAL_HRL, 1).
 
 -include_lib("kernel/include/logger.hrl").
--include("records.hrl").
+-include("../include/records.hrl").
 
 -record(jup_msg, {
  uuids = [] :: [binary()],

diff --git a/apps/jupyter/src/jup_kernel_backend.erl b/apps/jupyter/src/jup_kernel_backend.erl
@@ -17,6 +17,8 @@
  }.
 
 -callback init(Args :: map()) -> state().
+-callback language() -> binary().
+-callback deps() -> [module()].
 -callback opt_spec() -> {Desc :: iodata(), [getopt:option_spec()]}.
 
 -callback execute(Code :: binary(), jup_msg:type(), state()) ->
@@ -44,5 +46,6 @@
 ) -> {ok, jup_display:type()} | not_found.
 
 -optional_callbacks([
- opt_spec/0
+ opt_spec/0,
+ deps/0
 ]).
diff --git a/apps/jupyter/src/jupyter.erl b/apps/jupyter/src/jupyter.erl
@@ -1,7 +1,5 @@
 -module(jupyter).
 
--include("internal.hrl").
-
 -ignore_xref([
  start_kernel/4
 ]).