ensure C++ snippets work in R Markdown

rstudio · Mar 28, 2015 · 61542e7 · 61542e7
1 parent 6011cff
commit 61542e7
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/snippets/SnippetHelper.java b/src/gwt/src/org/rstudio/studio/client/workbench/snippets/SnippetHelper.java
@@ -24,6 +24,8 @@
 import org.rstudio.core.client.Debug;
 import org.rstudio.core.client.JsArrayUtil;
 import org.rstudio.core.client.StringUtil;
+import org.rstudio.core.client.regex.Pattern;
+import org.rstudio.studio.client.RStudioGinjector;
 import org.rstudio.studio.client.common.FilePathUtils;
 import org.rstudio.studio.client.server.ServerError;
 import org.rstudio.studio.client.server.ServerRequestCallback;
@@ -313,6 +315,11 @@ private String getActiveMode()
             editor_.getCursorPosition(),
             getMajorMode());
 
+      // TODO: Find a way to unify 'mode names' and 'state names' we use as
+      // prefixes for multi-mode documents
+      if (mode == "r-cpp" || mode == "c" || mode == "cpp")
+         mode = "c_cpp";
+
       return mode.toLowerCase();
    }