Extend providers to rmd

src/completions.ts

@@ -12,6 +12,7 @@ import { extendSelection } from './selection';
 import { cleanLine } from './lineCache';
 import { globalRHelp } from './extension';
 import { config } from './util';
+import { getChunks } from './rmarkdown';
 
 
 // Get with names(roxygen2:::default_tags())
@@ -33,6 +34,15 @@ export class HoverProvider implements vscode.HoverProvider {
         if(!session.globalenv){
             return null;
         }
+
+        if (document.languageId === 'rmd') {
+            const chunks = getChunks(document);
+            const chunk = chunks.find((chunk) => chunk.language === 'r' && chunk.startLine < position.line && chunk.endLine > position.line);
+            if (!chunk) {
+                return null;
+            }
+        }
+
         const wordRange = document.getWordRangeAtPosition(position);
         const text = document.getText(wordRange);
         // use juggling check here for both
@@ -50,6 +60,15 @@ export class HelpLinkHoverProvider implements vscode.HoverProvider {
         if(!config().get<boolean>('helpPanel.enableHoverLinks')){
             return null;
         }
+
+        if (document.languageId === 'rmd') {
+            const chunks = getChunks(document);
+            const chunk = chunks.find((chunk) => chunk.language === 'r' && chunk.startLine < position.line && chunk.endLine > position.line);
+            if (!chunk) {
+                return null;
+            }
+        }
+
         const re = /([a-zA-Z0-9._:])+/;
         const wordRange = document.getWordRangeAtPosition(position, re);
         const token = document.getText(wordRange);
@@ -71,6 +90,14 @@ export class HelpLinkHoverProvider implements vscode.HoverProvider {
 
 export class StaticCompletionItemProvider implements vscode.CompletionItemProvider {
     provideCompletionItems(document: vscode.TextDocument, position: vscode.Position): vscode.CompletionItem[] | undefined {
+        if (document.languageId === 'rmd') {
+            const chunks = getChunks(document);
+            const chunk = chunks.find((chunk) => chunk.language === 'r' && chunk.startLine < position.line && chunk.endLine > position.line);
+            if (!chunk) {
+                return undefined;
+            }
+        }
+
         if (document.lineAt(position).text
                     .substr(0, 2) === '#\'') {
             return roxygenTagCompletionItems;
@@ -93,6 +120,14 @@ export class LiveCompletionItemProvider implements vscode.CompletionItemProvider
             return items;
         }
 
+        if (document.languageId === 'rmd') {
+            const chunks = getChunks(document);
+            const chunk = chunks.find((chunk) => chunk.language === 'r' && chunk.startLine < position.line && chunk.endLine > position.line);
+            if (!chunk) {
+                return items;
+            }
+        }
+
         const trigger = completionContext.triggerCharacter;
 
         if (trigger === undefined) {

src/extension.ts

@@ -175,9 +175,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
 
 
     // register (session) hover and completion providers
-    vscode.languages.registerHoverProvider('r', new completions.HoverProvider());
-    vscode.languages.registerHoverProvider('r', new completions.HelpLinkHoverProvider());
-    vscode.languages.registerCompletionItemProvider('r', new completions.StaticCompletionItemProvider(), '@');
+    vscode.languages.registerHoverProvider(['r', 'rmd'], new completions.HoverProvider());
+    vscode.languages.registerHoverProvider(['r', 'rmd'], new completions.HelpLinkHoverProvider());
+    vscode.languages.registerCompletionItemProvider(['r', 'rmd'], new completions.StaticCompletionItemProvider(), '@');
 
     // deploy liveshare listener
     await rShare.initLiveShare(context);
@@ -235,7 +235,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
 
         // if session watcher is active, register dyamic completion provider
         const liveTriggerCharacters = ['', '[', '(', ',', '$', '@', '"', '\''];
-        vscode.languages.registerCompletionItemProvider('r', new completions.LiveCompletionItemProvider(), ...liveTriggerCharacters);
+        vscode.languages.registerCompletionItemProvider(['r', 'rmd'], new completions.LiveCompletionItemProvider(), ...liveTriggerCharacters);
     }
 
 

src/rmarkdown/index.ts

@@ -171,7 +171,7 @@ interface RMarkdownChunk {
 }
 
 // Scan document and return chunk info (e.g. ID, chunk range) from all chunks
-function getChunks(document: vscode.TextDocument): RMarkdownChunk[] {
+export function getChunks(document: vscode.TextDocument): RMarkdownChunk[] {
   const lines = document.getText().split(/\r?\n/);
   const chunks: RMarkdownChunk[] = [];