show help for code nav symbols that aren't found

rstudio · Sep 21, 2011 · f57370e · f57370e
1 parent 9bed933
commit f57370e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/cpp/session/modules/SessionCodeSearch.cpp b/src/cpp/session/modules/SessionCodeSearch.cpp
@@ -53,10 +53,6 @@
 
 // TODO: don't index code which is commented out
 
-// TODO: make sure the failure code branches are hit as expected
-
-// TODO: consider doing a help navigation if not found?
-
 // TODO: hookup back (stack/jump/gotofile/enable/disable)
 
 using namespace core ;

diff --git a/.../src/org/rstudio/studio/client/workbench/views/source/editors/text/TextEditingTarget.java b/.../src/org/rstudio/studio/client/workbench/views/source/editors/text/TextEditingTarget.java
@@ -1441,6 +1441,16 @@ else if (loc.getFile() != null)
                       fileTypeRegistry_.editFile(loc.getFile(), 
                                                  loc.getPosition());
                    }
+
+                   // otherwise try to show help
+                   else
+                   {
+                      String function = loc.getFunctionName();
+                      server_.getHelpAtCursor(
+                            function, 
+                            function.length(),
+                            new SimpleRequestCallback<Void>("Help"));   
+                   }
                }
             }
 

diff --git a/...wt/src/org/rstudio/studio/client/workbench/views/source/model/SourceServerOperations.java b/...wt/src/org/rstudio/studio/client/workbench/views/source/model/SourceServerOperations.java
@@ -14,6 +14,7 @@
 
 import com.google.gwt.core.client.JsArrayString;
 import org.rstudio.core.client.js.JsObject;
+import org.rstudio.studio.client.common.codetools.CodeToolsServerOperations;
 import org.rstudio.studio.client.server.ServerRequestCallback;
 import org.rstudio.studio.client.server.Void;
 import org.rstudio.studio.client.workbench.codesearch.model.CodeSearchServerOperations;
@@ -29,6 +30,7 @@
  * whether the user has actually hit save. 
  */
 public interface SourceServerOperations extends FilesServerOperations, 
+                                                CodeToolsServerOperations,
                                                 CodeSearchServerOperations
 
 {