Adapt vscode-r-test-adapter

extensions/positron-r/package.json

@@ -80,6 +80,16 @@
         "title": "%r.command.packageTest.title%",
         "shortTitle": "%r.menu.packageTest.title%"
       },
+      {
+        "command": "r.useTestthat",
+        "category": "R",
+        "title": "%r.command.useTestthat.title%"
+      },
+      {
+        "command": "r.useTest",
+        "category": "R",
+        "title": "%r.command.useTest.title%"
+      },
       {
         "command": "r.packageCheck",
         "category": "R",
@@ -145,10 +155,10 @@
           "default": "off",
           "description": "%r.configuration.tracing.description%"
         },
-        "positron.r.testing.experimental": {
+        "positron.r.testing": {
           "type": "boolean",
-          "default": false,
-          "description": "%r.configuration.experimentalPackageTesting.description%"
+          "default": true,
+          "description": "%r.configuration.packageTesting.description%"
         },
         "positron.r.restoreWorkspace": {
           "scope": "window",
@@ -403,6 +413,28 @@
         "path": "./snippets/r.code-snippets"
       }
     ],
+    "viewsWelcome": [
+      {
+        "view": "testing",
+        "contents": "Workspace does not appear to be an R package.",
+        "when": "!isRPackage"
+      },
+      {
+        "view": "testing",
+        "contents": "R tests can appear here if the package uses testthat and the setting Positron > R: Testing is set to 'true'.\n[Adjust this setting](command:workbench.action.openSettings?\"positron.r.testing\")",
+        "when": "isRPackage && !config.positron.r.testing"
+      },
+      {
+        "view": "testing",
+        "contents": "Package does not appear to use testthat.\n[Configure testhat for R](command:r.useTestthat)",
+        "when": "isRPackage && config.positron.r.testing && !testthatIsConfigured"
+      },
+      {
+        "view": "testing",
+        "contents": "No testthat tests found.\n[Add a test](command:r.useTest)",
+        "when": "isRPackage && config.positron.r.testing && testthatIsConfigured && !testthatHasTests"
+      }
+    ],
     "taskDefinitions": [
       {
         "type": "rPackageTask",
@@ -435,6 +467,7 @@
     "@types/glob": "^7.2.0",
     "@types/mocha": "^9.1.0",
     "@types/node": "14.x",
+    "@types/split2": "^4.2.2",
     "@types/which": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
     "@typescript-eslint/parser": "^5.12.1",
@@ -448,7 +481,9 @@
   },
   "dependencies": {
     "p-queue": "^6.6.2",
-    "vscode-languageclient": "^7.0.0"
+    "split2": "^4.2.0",
+    "vscode-languageclient": "^7.0.0",
+    "web-tree-sitter": "^0.20.8"
   },
   "repository": {
     "type": "git",

extensions/positron-r/package.nls.json

@@ -10,6 +10,8 @@
 	"r.command.packageBuild.title": "Build R Package",
 	"r.command.packageInstall.title": "Install R Package and Restart R",
 	"r.command.packageTest.title": "Test R Package",
+	"r.command.useTestthat.title": "Configure testthat",
+	"r.command.useTest.title": "Add (or visit) a test file",
 	"r.command.packageCheck.title": "Check R Package",
 	"r.command.packageDocument.title": "Document R Package",
 	"r.menu.createNewFile.title": "R File",
@@ -33,7 +35,7 @@
 	"r.configuration.logLevel.debug.description": "Debug messages",
 	"r.configuration.logLevel.trace.description": "Verbose tracing messages",
 	"r.configuration.logLevel.description": "Log level for the R Kernel (requires restart to take effect)",
-	"r.configuration.experimentalPackageTesting.description": "Experimental UI support for testing R packages",
+	"r.configuration.packageTesting.description": "Explore and run testthat tests",
 	"r.configuration.restoreWorkspace.description": "Restore the workspace from .RData on startup (requires restart to take effect)",
 	"r.configuration.extraArguments.description": "Extra command-line arguments for R intialization",
 	"r.configuration.quietMode.description": "Run R in quiet mode, to suppress initial copyright and welcome messages (requires restart to take effect)",

extensions/positron-r/src/commands.ts

@@ -10,6 +10,7 @@ import { getRunningRRuntime } from './provider';
 import { getRPackageName } from './contexts';
 import { getRPackageTasks } from './tasks';
 import { randomUUID } from 'crypto';
+import { refreshTestthatStatus } from './testing/watcher';
 
 export async function registerCommands(context: vscode.ExtensionContext, runtimes: Map<string, RRuntime>) {
 
@@ -97,6 +98,14 @@ export async function registerCommands(context: vscode.ExtensionContext, runtime
 			positron.runtime.executeCode('r', 'devtools::test()', true);
 		}),
 
+		vscode.commands.registerCommand('r.useTestthat', () => {
+			positron.runtime.executeCode('r', 'usethis::use_testthat()', true);
+		}),
+
+		vscode.commands.registerCommand('r.useTest', () => {
+			positron.runtime.executeCode('r', 'usethis::use_test("rename-me")', true);
+		}),
+
 		vscode.commands.registerCommand('r.packageCheck', async () => {
 			const tasks = await getRPackageTasks();
 			const task = tasks.filter(task => task.definition.task === 'r.task.packageCheck')[0];

extensions/positron-r/src/contexts.ts

@@ -3,10 +3,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { refreshTestthatStatus } from './testing/watcher';
 
 export async function setContexts(_context: vscode.ExtensionContext): Promise<void> {
 	const isRPackage = await detectRPackage();
 	vscode.commands.executeCommand('setContext', 'isRPackage', isRPackage);
+
+	await refreshTestthatStatus();
 }
 
 export async function detectRPackage(): Promise<boolean> {

extensions/positron-r/src/extension.ts

@@ -9,7 +9,7 @@ import { registerCommands } from './commands';
 import { registerFormatter } from './formatting';
 import { providePackageTasks } from './tasks';
 import { setContexts } from './contexts';
-import { discoverTests } from './testing';
+import { setupTestExplorer, refreshTestExplorer } from './testing/testing';
 import { rRuntimeProvider } from './provider';
 import { RRuntime } from './runtime';
 
@@ -38,7 +38,11 @@ export function activate(context: vscode.ExtensionContext) {
 	// Provide tasks.
 	providePackageTasks(context);
 
-	// Discover R package tests.
-	discoverTests(context);
-
+	// Setup testthat test explorer.
+	setupTestExplorer(context);
+	vscode.workspace.onDidChangeConfiguration(async event => {
+		if (event.affectsConfiguration('positron.r.testing')) {
+			refreshTestExplorer(context);
+		}
+	});
 }

extensions/positron-r/src/testing/LICENSE

@@ -0,0 +1,22 @@
+
+MIT License
+
+Copyright (c) [2023] [author]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

extensions/positron-r/src/testing/README

@@ -0,0 +1 @@
+The code in this folder (positron-r/src/testing/) has been adapted from https://github.com/meakbiyik/vscode-r-test-adapter, which is licensed under the MIT license.