syscrusher · Oct 14, 2015 · Oct 16, 2015 · Oct 18, 2015 · Oct 18, 2015 · Oct 18, 2015
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Commands/Build.tmCommand b/Commands/Build.tmCommand
@@ -7,10 +7,10 @@
 	<key>beforeRunningCommand</key>
 	<string>saveModifiedFiles</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate"
-Go::go "build", :verb =&gt; "Building"</string>
+Go::go "build", :verb => "Building"</string>
 	<key>input</key>
 	<string>document</string>
 	<key>inputFormat</key>

diff --git a/Commands/Complete.tmCommand b/Commands/Complete.tmCommand
@@ -3,32 +3,55 @@
 <plist version="1.0">
 <dict>
 	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
+	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby18
-require ENV['TM_SUPPORT_PATH'] + '/lib/ui.rb'
+
+require "open3"
+
+require ENV['TM_SUPPORT_PATH'] + "/lib/ui.rb"
 require ENV['TM_SUPPORT_PATH'] + "/lib/escape.rb"
-require ENV['TM_SUPPORT_PATH'] + "/lib/tm/require_cmd.rb"
-require ENV['TM_SUPPORT_PATH'] + "/lib/tm/htmloutput.rb"
+require ENV['TM_SUPPORT_PATH'] + "/lib/exit_codes.rb"
 require ENV['TM_SUPPORT_PATH'] + "/lib/web_preview"
+require ENV['TM_SUPPORT_PATH'] + "/lib/tm/htmloutput.rb"
+
+# TextMate's special GOPATH used in .tm_properties files prepended to the environment's GOPATH
+ENV['GOPATH'] = (ENV.has_key?('TM_GOPATH') ? ENV['TM_GOPATH'] : '') +
+                (ENV.has_key?('GOPATH') ? ':' + ENV['GOPATH'] : '').sub(/^:+/,'')
 
-# current document
+# Call tool to determine gopath
+if ENV.has_key?('TM_GO_DYNAMIC_GOPATH')
+  Dir.chdir(ENV['TM_DIRECTORY']) do
+    ENV['GOPATH'] = `#{ENV['TM_GO_DYNAMIC_GOPATH']}`.chomp
+  end
+end
+
+gocode = ENV['TM_GOCODE'] || 'gocode'
+
+# load current document from stdin
 document = []
-File.open(ENV['TM_FILEPATH'], "r+") do |file|
-  document = file.readlines
+while line = $stdin.gets
+  document.push(line)
 end
 
 # byte offset of cursor position from the beginning of file
 cursor = document[ 0, ENV['TM_LINE_NUMBER'].to_i - 1].join().length + ENV['TM_LINE_INDEX'].to_i
-output = `"$TM_GOCODE" -f=csv -in=#{e_sh ENV['TM_FILEPATH']} autocomplete #{cursor}`
+
+# send document to stdin of gocode and read output
+output = ""
+Open3.popen3("#{gocode} -f=csv autocomplete #{ENV['TM_FILEPATH']} #{cursor}") {|stdin, stdout, stderr|
+  stdin.puts document.join
+  stdin.close
+  output = stdout.readlines.join
+}
 
 # quit if no completions found
 TextMate.exit_show_tool_tip("No completions found.") if output.length == 0
 
 # set up images for use by DIALOG
 # this probably should be done only once, somehow.
 icon_plist = "{ " + [ "const", "func", "package", "type", "var" ].map { |v| 
-  "#{v} = '#{ENV['TM_BUNDLE_SUPPORT']}/icons/#{v}.png';"
+  "#{v} = '#{ENV['TM_BUNDLE_SUPPORT']}/icons/#{v}.pdf';"
 }.join(" ") + " }"
 system( ENV['DIALOG'], "images", "--register", icon_plist )
 
@@ -59,7 +82,7 @@ def make_completion_hash(line)
   def get_f_args(sig)
     depths = depth_at_i(sig)
     pos = sig.index(")")
-    while pos != nil &amp;&amp; depths[pos] &gt; 0
+    while pos != nil &amp;&amp; depths[pos] > 0
       pos = sig.index(")", pos+1)
     end
     return sig[ Range.new(sig.index("(")+1, pos - 1) ]
@@ -73,7 +96,7 @@ def make_completion_hash(line)
 
     while pos != nil
       if depths[pos] == 0
-        args &lt;&lt; sig[ Range.new(start, pos-1) ]  
+        args &lt;&lt; sig[ Range.new(start, pos-1) ]
         start = pos+1
       end
       pos = sig.index(",", pos+1)
@@ -91,12 +114,12 @@ def make_completion_hash(line)
     insert = ""
   end
   
-  return { 'match' =&gt; match, 'display' =&gt;  display, 'insert' =&gt; insert, 'image' =&gt; image }
+  return { 'match' => match, 'display' =>  display, 'insert' => insert, 'image' => image }
 end
 
 # build the list of completion choices.
 hash = output.split("\n").collect { |v| make_completion_hash( v ) }
-options = { :extra_chars =&gt; "_", :case_insensitive =&gt; false }
+options = { :extra_chars => "_", :case_insensitive => false }
 
 # if there is only one match, insert. no need to show the menu
 if hash.length == 1
@@ -114,7 +137,7 @@ end</string>
 	<key>hideFromUser</key>
 	<string>true</string>
 	<key>input</key>
-	<string>none</string>
+	<string>document</string>
 	<key>inputFormat</key>
 	<string>text</string>
 	<key>keyEquivalent</key>

diff --git a/Commands/Def.tmCommand b/Commands/Def.tmCommand
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>beforeRunningCommand</key>
+	<string>nop</string>
+	<key>command</key>
+	<string>#!/usr/bin/env ruby18
+
+require ENV['TM_SUPPORT_PATH'] + '/lib/textmate'
+require ENV['TM_SUPPORT_PATH'] + '/lib/tm/process'
+require ENV['TM_SUPPORT_PATH'] + '/lib/tm/save_current_document'
+require 'pathname'
+
+# TextMate's special TM_GODEF or expect 'godef' on PATH
+godef_cmd = ENV['TM_GODEF'] || 'godef'
+
+TextMate.save_if_untitled('go')
+
+# load current document from stdin
+document = []
+while line = $stdin.gets
+  document.push(line)
+end
+
+# byte offset of cursor position from the beginning of file
+cursor = document[ 0, ENV['TM_LINE_NUMBER'].to_i - 1].join().length + ENV['TM_LINE_INDEX'].to_i
+
+args = []
+args.push(godef_cmd)
+args.push('-f')
+args.push(ENV['TM_FILEPATH'])
+args.push('-o')
+args.push("#{cursor}")
+
+# /usr/local/Cellar/go/1.7.1/libexec/src/database/sql/sql.go:960:15
+out, err = TextMate::Process.run(*args)
+
+if err.nil? || err == ''
+  file_details = out.split(':')
+  file = Pathname.new(file_details[0]).realpath
+  TextMate.go_to(:file =&gt; file,
+                 :line =&gt; file_details[1].to_i,
+                 :column =&gt; file_details[2].to_i)
+elsif err.casecmp "godef: no identifier found";
+  require "#{ENV['TM_SUPPORT_PATH']}/lib/ui.rb"
+  package = TextMate::UI.request_string :title =&gt; "Open Package", :default =&gt; '', :prompt =&gt; "Which package do you wish to open?"
+  #TODO: Find and open package
+else
+  TextMate.exit_show_tool_tip(err)
+end</string>
+	<key>input</key>
+	<string>selection</string>
+	<key>inputFormat</key>
+	<string>text</string>
+	<key>keyEquivalent</key>
+	<string>^.</string>
+	<key>name</key>
+	<string>Go to Definition</string>
+	<key>outputCaret</key>
+	<string>afterOutput</string>
+	<key>outputFormat</key>
+	<string>text</string>
+	<key>outputLocation</key>
+	<string>toolTip</string>
+	<key>requiredCommands</key>
+	<array>
+		<dict>
+			<key>command</key>
+			<string>godef</string>
+			<key>moreInfoURL</key>
+			<string>https://github.com/rogpeppe/godef</string>
+			<key>variable</key>
+			<string>TM_GODEF</string>
+		</dict>
+	</array>
+	<key>scope</key>
+	<string>source.go</string>
+	<key>uuid</key>
+	<string>A04DD936-EEB1-484E-BF47-98BD6709D00C</string>
+	<key>version</key>
+	<integer>2</integer>
+</dict>
+</plist>
diff --git a/...umentation for Word : Selection.tmCommand → Commands/Documentation.tmCommand b/...umentation for Word : Selection.tmCommand → Commands/Documentation.tmCommand
@@ -5,40 +5,40 @@
 	<key>beforeRunningCommand</key>
 	<string>saveModifiedFiles</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate"
-Go::godoc
+Go::gogetdoc
 </string>
 	<key>fallbackInput</key>
 	<string>word</string>
 	<key>input</key>
-	<string>selection</string>
+	<string>document</string>
 	<key>inputFormat</key>
 	<string>text</string>
 	<key>keyEquivalent</key>
 	<string>^h</string>
 	<key>name</key>
-	<string>Documentation for Word / Selection</string>
+	<string>Show Documentation</string>
 	<key>outputCaret</key>
 	<string>afterOutput</string>
 	<key>outputFormat</key>
-	<string>html</string>
+	<string>text</string>
 	<key>outputLocation</key>
 	<string>toolTip</string>
 	<key>requiredCommands</key>
 	<array>
 		<dict>
 			<key>command</key>
-			<string>godoc</string>
+			<string>gogetdoc</string>
 			<key>locations</key>
 			<array>
-				<string>/opt/local/bin/godoc</string>
-				<string>/usr/local/bin/godoc</string>
-				<string>/usr/local/go/bin/godoc</string>
+				<string>/opt/local/bin/gogetdoc</string>
+				<string>/usr/local/bin/gogetdoc</string>
+				<string>/usr/local/go/bin/gogetdoc</string>
 			</array>
 			<key>variable</key>
-			<string>TM_GODOC</string>
+			<string>TM_GOGETDOC</string>
 		</dict>
 	</array>
 	<key>scope</key>

diff --git a/Commands/Fmt.tmCommand b/Commands/Fmt.tmCommand
@@ -7,6 +7,7 @@
 	<key>command</key>
 	<string>#!/usr/bin/env bash
 . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
+. "${TM_BUNDLE_SUPPORT}/go_setup.sh"
 
 (eval "${TM_GOFMT:-gofmt}") || exit_show_tool_tip</string>
 	<key>input</key>