better sem analysis

explain.ce

@@ -8,36 +8,9 @@
 
 var fd = use('fd')
 var json = use('json')
-var tokenize_mod = use('tokenize')
-var parse_mod = use('parse')
-var fold_mod = use('fold')
-var index_mod = use('index')
 var explain_mod = use('explain')
 var shop = use('internal/shop')
 
-// Resolve import paths on an index in-place.
-var resolve_imports = function(idx_obj, fname) {
-  var fi = shop.file_info(fd.realpath(fname))
-  var ctx = fi.package
-  var ri = 0
-  var rp = null
-  var lp = null
-  while (ri < length(idx_obj.imports)) {
-    rp = shop.resolve_use_path(idx_obj.imports[ri].module_path, ctx)
-    // Fallback: check sibling files in the same directory.
-    if (rp == null) {
-      lp = fd.dirname(fd.realpath(fname)) + '/' + idx_obj.imports[ri].module_path + '.cm'
-      if (fd.is_file(lp)) {
-        rp = lp
-      }
-    }
-    if (rp != null) {
-      idx_obj.imports[ri].resolved_path = rp
-    }
-    ri = ri + 1
-  }
-}
-
 var mode = null
 var span_arg = null
 var symbol_name = null
@@ -47,12 +20,10 @@ var parts = null
 var filename = null
 var line = null
 var col = null
-var src = null
 var idx = null
 var indexes = []
 var explain = null
 var result = null
-var pipeline = {tokenize: tokenize_mod, parse: parse_mod, fold: fold_mod}
 
 for (i = 0; i < length(args); i++) {
   if (args[i] == '--span') {
@@ -108,9 +79,7 @@ if (mode == "span") {
     $stop()
   }
 
-  src = text(fd.slurp(filename))
-  idx = index_mod.index_file(src, filename, pipeline)
-  resolve_imports(idx, filename)
+  idx = shop.index_file(filename)
   explain = explain_mod.make(idx)
   result = explain.at_span(line, col)
 
@@ -139,11 +108,8 @@ if (mode == "symbol") {
   }
 
   if (length(files) == 1) {
-    // Single file: use by_symbol for a focused result.
     filename = files[0]
-    src = text(fd.slurp(filename))
-    idx = index_mod.index_file(src, filename, pipeline)
-    resolve_imports(idx, filename)
+    idx = shop.index_file(filename)
     explain = explain_mod.make(idx)
     result = explain.by_symbol(symbol_name)
 
@@ -154,13 +120,10 @@ if (mode == "symbol") {
       print("\n")
     }
   } else if (length(files) > 1) {
-    // Multiple files: index each and search across all.
     indexes = []
     i = 0
     while (i < length(files)) {
-      src = text(fd.slurp(files[i]))
-      idx = index_mod.index_file(src, files[i], pipeline)
-      resolve_imports(idx, files[i])
+      idx = shop.index_file(files[i])
       indexes[] = idx
       i = i + 1
     }