Skip to content

Commit 77054c6

Browse files
authored
Merge branch 'REditorSupport:master' into DataViewerUpdate2
2 parents eaf9e53 + 535499e commit 77054c6

35 files changed

+1791
-3113
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,3 @@ jobs:
7272
shell: Rscript {0}
7373
env:
7474
LINTR_ERROR_ON_LINT: true
75-
devreplay:
76-
runs-on: ubuntu-latest
77-
steps:
78-
- uses: actions/checkout@v3
79-
- uses: actions/setup-node@v3
80-
with:
81-
node-version: 18
82-
- run: npm install
83-
- name: Run devreplay
84-
run: ./node_modules/.bin/devreplay ./src devreplay.json

.vscode/launch.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"outFiles": [
1616
"${workspaceFolder}/out/src/**/*.js"
1717
],
18-
"preLaunchTask": "watchAll"
1918
},
2019
{
2120
"name": "Launch Extension (--disable-extensions)",
@@ -29,7 +28,6 @@
2928
"outFiles": [
3029
"${workspaceFolder}/out/src/**/*.js"
3130
],
32-
"preLaunchTask": "watchAll"
3331
},
3432
{
3533
"name": "Extension Tests",

.vscode/tasks.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,17 @@
3232
},
3333
{
3434
"type": "npm",
35-
"script": "compile",
35+
"script": "build",
3636
"problemMatcher": "$tsc"
3737
},
38-
{
38+
{
3939
"type": "npm",
4040
"script": "watch",
41-
"problemMatcher": "$tsc-watch",
42-
"isBackground": true,
43-
"presentation": {
44-
"reveal": "never"
45-
},
46-
"group": "build"
47-
},
41+
"group": "build",
42+
// install https://marketplace.visualstudio.com/items?itemName=eamodio.tsl-problem-matcher
43+
"problemMatcher": ["$ts-webpack-watch"],
44+
"isBackground": true
45+
},
4846
{
4947
"type": "npm",
5048
"script": "watchHelp",

.vscodeignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
.xls
88
.xlsx
99
**/*.map
10-
devreplay.json
1110
html/**/*.ts
1211
out/test/**
1312
src/

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 REditorSupport
3+
Copyright (c) 2025 REditorSupport
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
[![Badge](https://aka.ms/vsls-badge)](https://aka.ms/vsls)
44

5-
This [VS Code](https://code.visualstudio.com/) extension provides support for the [R programming language](https://www.r-project.org), including features such as
6-
extended syntax highlighting, R language service based on code analysis, interacting with R terminals, viewing data, plots, workspace variables, help pages, managing packages, and working with [R Markdown](https://rmarkdown.rstudio.com/) documents.
5+
This [VS Code](https://code.visualstudio.com/) extension provides support for the [R programming language](https://www.r-project.org), including features such as R language service based on code analysis, interacting with R terminals, viewing data, plots, workspace variables, help pages, managing packages, and working with [R Markdown](https://rmarkdown.rstudio.com/) documents.
6+
7+
The R and R Markdown syntaxes are located in a slibing package [vscode-R-syntax](https://github.com/REditorSupport/vscode-R-syntax).
78

89
Go to the [wiki](https://github.com/REditorSupport/vscode-R/wiki) to view the documentation of the extension.
910

@@ -33,8 +34,6 @@ Go to the installation wiki pages ([Windows](https://github.com/REditorSupport/v
3334

3435
## Features
3536

36-
* Extended syntax highlighting for R, R Markdown, and R Documentation.
37-
3837
* Snippets for R and R Markdown.
3938

4039
* [R Language Service](https://github.com/REditorSupport/vscode-R/wiki/R-Language-Service): Code completion, function signature, symbol highlight, document outline, formatting, definition, diagnostics, references, and more.

ThirdPartyNotices.txt

Lines changed: 0 additions & 33 deletions
This file was deleted.

devreplay.json

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)