Merge pull request #87 from trotzig/cli-resolve

Cli resolve

Author: trotzig

…port-js-sublime/Default.sublime-commands Default.sublime-commandsplugin/import-js-sublime/Default.sublime-commands renamed to Default.sublime-commands plugin/import-js-sublime/Default.sublime-commands renamed to Default.sublime-commands

@@ -7,5 +7,10 @@
     "caption": "ImportJS: import word under cursor",
     "command": "import_js",
     "args": {"word": true}
+  },
+  {
+    "caption": "ImportJS: goto module",
+    "command": "import_js",
+    "args": {"word": true, "goto": true}
   }
 ]

…ugin/import-js-sublime/Main.sublime-menu Main.sublime-menuplugin/import-js-sublime/Main.sublime-menu renamed to Main.sublime-menu plugin/import-js-sublime/Main.sublime-menu renamed to Main.sublime-menu

@@ -1,17 +1,21 @@
 # Introduction
 
 `import-js` is a tool to automatically import dependencies in your JavaScript
-project. Use it in Vim or Emacs by placing your cursor on a variable and hit
-`<leader>j` (Vim), or `(M-x) import-js-import` (Emacs).
+project. Use it in Vim, Emacs, or Sublime by placing your cursor on a variable
+and hit `<leader>j` (Vim), or `(M-x) import-js-import` (Emacs), or select
+"ImportJS: import word under cursor" from the Command Palette (Sublime).
 
 ![Demo of import-js in action](https://raw.github.com/trotzig/import-js/master/import-js-demo.gif)
 
 ## Editor support
 
 import-js comes with plugins for the following editors:
 
-- [Emacs (experimental)](EMACS.md) (Thanks to @kevin.kehl!)
+- [Emacs (experimental)](EMACS.md) (Thanks to
+  [@kevin.kehl](https://github.com/kevin.kehl)!)
 - [Vim](VIM.md)
+- [Sublime](Sublime.md) (Thanks to
+  [@janpaul123](https://github.com/janpaul123))
 - [(your editor here?)](CONTRIBUTING.md)
 
 Detailed instructions on how to install import-js can be found in the editor
@@ -47,8 +51,9 @@ document.createElement(new Button({ text: 'Save' }).toDOMElement());
 At this point, `Button` is undefined. We need to import it. If you are used to
 doing this manually, this involves figuring out the path to the JavaScript
 module that defines `Button`. With import-js, you instead place your cursor on
-the word "Button", then hit `<leader>j` (Vim) or `(M-x) import-js-import`
-(Emacs). The file buffer will now change to the following:
+the word "Button", then hit `<leader>j` (Vim), `(M-x) import-js-import`
+(Emacs), or choose "ImportJS: import word under cursor" (Sublime). The file
+buffer will now change to the following:
 
 ```js
 var Button = require('components/button');
@@ -72,8 +77,8 @@ Since import-js is pretty good at finding JS modules, it makes sense that
 there's an option to open/go to a file rather than import it. This is similar
 to VIM's built in ["Open file under
 cursor"](http://vim.wikia.com/wiki/Open_file_under_cursor). Use it by placing
-the cursor on a variable and hit `<leader>g` (Vim) or `(M-x) import-js-goto`
-(Emacs).
+the cursor on a variable and hit `<leader>g` (Vim), `(M-x) import-js-goto`
+(Emacs), or choose "ImportJS: goto module" (Sublime).
 
 ## Things to note
 
@@ -82,7 +87,8 @@ the cursor on a variable and hit `<leader>g` (Vim) or `(M-x) import-js-goto`
   `var`/`const`/`let`/`import` (configurable through the `declaration_keyword`
   option)
 - As part of resolving an import, all imports will be sorted
-- The Vim plugin is written in Ruby. You need a [Vim with Ruby support](VIM.md).
+- The core of the plugin is written in Ruby. If you are using Vim, you need a
+  [Vim with Ruby support](VIM.md).
 
 ## Configuration
 

README.md

@@ -17,5 +17,6 @@
 
     ```
     { "keys": ["super+alt+i"], "command": "import_js" },
-    { "keys": ["super+alt+j"], "command": "import_js", "args": {"word": true} }
+    { "keys": ["super+alt+j"], "command": "import_js", "args": {"word": true} },
+    { "keys": ["super+alt+g"], "command": "import_js", "args": {"word": true, "goto": true} },
     ```

SUBLIME.md

@@ -6,7 +6,10 @@ require 'json'
 
 opts = Slop.parse do |o|
   o.string '-w', '--word', 'a word/variable to import'
+  o.bool '--goto', 'instead of importing, just print the path to a module'
   o.array '--selections', 'a list of resolved selections, e.g. Foo:0,Bar:1'
+  o.string '--filename',
+    'a path to the file which contents are being passed in as stdin'
   o.on '-v', '--version', 'print the current version' do
     puts ImportJS::VERSION
     exit
@@ -29,14 +32,21 @@ end
 
 editor = ImportJS::CommandLineEditor.new(file_contents, opts)
 importer = ImportJS::Importer.new(editor)
-if opts[:word]
+if opts.goto?
+  importer.goto
+elsif opts[:word]
   importer.import
 else
   importer.import_all
 end
 
-# Print resulting file to stdout
-puts editor.current_file_content
+if opts.goto?
+  # Print the path to the module to go to
+  puts editor.goto
+else
+  # Print resulting file to stdout
+  puts editor.current_file_content
+end
 
 # Print messages to stderr
 meta = {

bin/import-js

@@ -16,10 +16,16 @@ def run(self, edit, **args):
       command.append('--word')
       command.append(word)
 
+    if(args.get('goto')):
+      command.append('--goto')
+
     if(args.get('selections')):
       command.append('--selections')
       command.append(','.join(args.get('selections')))
 
+    command.append('--filename')
+    command.append(self.view.file_name())
+
     print(command)
 
     proc = subprocess.Popen(
@@ -48,12 +54,21 @@ def run(self, edit, **args):
         return
 
     stdout = result[0].decode()
-    self.view.replace(edit, entire_file_region, stdout)
+    if(args.get('goto')):
+      if(len(stdout.rstrip()) > 0):
+        self.view.window().open_file(self.project_path() + '/' + stdout.rstrip())
+    else:
+      self.view.replace(edit, entire_file_region, stdout)
 
   def rerun(self, edit, args, selections):
     args['selections'] = selections
     self.run(edit, **args)
 
+  def project_path(self):
+    for folder in self.view.window().project_data().get('folders'):
+      if(self.view.file_name().startswith(folder.get('path'))):
+        return folder.get('path')
+
   def ask_for_selections(self, selections, on_selections_done):
     selected = []
     selections_iter = iter(selections)

plugin/import-js-sublime/import-js.py import-js.pyplugin/import-js-sublime/import-js.py renamed to import-js.py

@@ -6,6 +6,7 @@ def initialize(lines, opts)
       @ask_for_selections = []
       @selections = opts[:selections] unless opts[:selections].empty?
       @word = opts[:word]
+      @filename = opts[:filename]
     end
 
     # @return [String]
@@ -15,13 +16,17 @@ def current_word
 
     # @return [String?]
     def path_to_current_file
-      # Not yet implemented.
-      nil
+      @filename
     end
 
     # @param file_path [String]
-    def open_file(_file_path)
-      fail 'not supported'
+    def open_file(file_path)
+      @goto = file_path
+    end
+
+    # @return [String]
+    def goto
+      @goto
     end
 
     # @param str [String]

lib/import_js/command_line_editor.rb

@@ -47,8 +47,7 @@ def open_file(file_path)
   #
   # @return [String?]
   def path_to_current_file
-    # Not yet implemented for Emacs
-    nil
+    @path
   end
 
   # Display a message to the user.

lib/import_js/emacs_editor.rb

@@ -44,7 +44,7 @@ def goto
       @timing[:end] = Time.now
       return if js_modules.empty?
       js_module = resolve_one_js_module(js_modules, variable_name)
-      @editor.open_file(js_module.file_path)
+      @editor.open_file(js_module.file_path) if js_module
     end
 
     def fix_imports

lib/import_js/importer.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module ImportJS
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end