Skip to content

Commit d493c91

Browse files
committed
Merge branch 'master' into feature/update-package.json
2 parents 8df8b72 + 394c942 commit d493c91

File tree

5 files changed

+114
-68
lines changed

5 files changed

+114
-68
lines changed

.vscode/launch.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
"runtimeExecutable": "${execPath}",
2020
"args": [
2121
"${workspaceFolder}/test/resources",
22-
"--install-extension",
23-
"ms-vscode.cpptools",
24-
"--disable-extensions",
22+
"--disable-extension=fortran-lang.linter-gfortran",
2523
"--extensionDevelopmentPath=${workspaceFolder}",
2624
"--extensionTestsPath=${workspaceFolder}/out/test"
2725
],

CONTRIBUTING.md

Lines changed: 63 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,67 @@
1-
# #CONTRIBUTING
1+
# Contributing
22

3-
You _always_ want to look at this file **before** contributing. In here you
4-
should find steps that you need to take to set up your development environment
5-
as well as instructions for coding standards and contribution guidelines.
3+
👍🎉 Thank you for taking the time to contribute! 🎉👍
4+
5+
In this file you will find all the steps necessary to guide you through your first contribution to the project.
6+
7+
Please note our [Code of Conduct](https://github.com/fortran-lang/.github/blob/main/CODE_OF_CONDUCT.md) and adhere to it in all your interactions with this project.
8+
9+
## 📚 Getting Started
10+
11+
### Downloading ⬇️
12+
13+
Firstly, fork the repository from <https://github.com/fortran-lang/vscode-fortran-support>.
14+
15+
Then clone the repository into your local machine.
16+
17+
```sh
18+
[email protected]:<YOUR-USERNAME>/vscode-fortran-support.git
19+
```
20+
21+
Where `<YOUR-USERNAME>` should be your GitHub username.
22+
23+
### Dependencies
24+
25+
To build this project you will need [NodeJS](https://nodejs.org/) `>= 16.13.1`.
26+
Open a terminal and run for a quick dependency installation:
27+
28+
```sh
29+
npm ci
30+
```
31+
32+
or for a full dependency installation:
33+
34+
```sh
35+
npm install
36+
```
37+
38+
### Compiling 🏗️
39+
40+
During development, you can run a watcher to continuously check for changes and compile the extension:
41+
42+
```sh
43+
npm run watch-dev
44+
```
45+
46+
or do a standalone compilation via:
47+
48+
```sh
49+
npm run compile-dev
50+
```
51+
52+
👉 **Tip!** You can press <kbd>CTRL+SHIFT+B</kbd> (<kbd>CMD+SHIFT+B</kbd> on Mac) to start the watch task.
53+
54+
### Developing & Debugging 🐞️
55+
56+
You can now start writing code the `watcher` task will check for compilation errors.
57+
You can actively debug the extension by pressing <kbd>F5</kbd> with `Launch Extension` selected.
58+
59+
👉 **Tip!** You don't need to stop and restart the development version of VS Code after each change. You can just execute `Reload Window` from the command palette in the
60+
VS Code window prefixed with `[Extension Development Host]`.
61+
62+
63+
64+
https://user-images.githubusercontent.com/16143716/167411072-58a25378-13ad-41c5-bb20-2dacc8ad004a.mp4
665

7-
## Setup instructions
866

9-
First of all, this is a Visual Studio Code extension that uses TypeScript and tools based on [Node.js](https://nodejs.org/en/) with dependencies from npm. So you will need to have Node installed on your `$PATH`.
1067

11-
1. Fork the repo
12-
2. Clone your fork
13-
3. Create a branch
14-
4. Run `npm install`
15-
5. To test the extension run `npm run test:grammar && npm test`

package-lock.json

Lines changed: 46 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@
375375
},
376376
"scripts": {
377377
"vscode:prepublish": "npm run compile",
378+
"clean": "npx rimraf dist out .vscode-test",
378379
"compile": "webpack --mode production",
379380
"compile-dev": "webpack --mode development",
380381
"watch": "webpack --mode production --watch --progress",
@@ -396,12 +397,12 @@
396397
"@types/glob": "^7.2.0",
397398
"@types/mocha": "^9.1.0",
398399
"@types/node": "^16.11.33",
399-
"@types/vscode": "^1.63.0",
400+
"@types/vscode": "^1.67.0",
400401
"@types/which": "^2.0.1",
401402
"@typescript-eslint/eslint-plugin": "^5.22.0",
402403
"@typescript-eslint/parser": "^5.22.0",
403404
"@vscode/test-electron": "^2.1.2",
404-
"eslint": "^8.14.0",
405+
"eslint": "^8.15.0",
405406
"eslint-plugin-import": "^2.25.4",
406407
"eslint-plugin-jsdoc": "^39.2.9",
407408
"eslint-plugin-prettier": "^4.0.0",

test/runTest.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@ async function main() {
1313
// Passed to --extensionTestsPath
1414
const extensionTestsPath = path.resolve(__dirname, './index');
1515

16-
const launchArgs = [
17-
workspacePath,
18-
'--disable-extensions',
19-
'--install-extension',
20-
'ms-vscode.cpptools',
21-
];
16+
const launchArgs = [workspacePath, '--disable-extensions'];
2217
// Download VS Code, unzip it and run the integration test
2318
await runTests({
2419
launchArgs,

0 commit comments

Comments
 (0)