Skip to content

Commit b04eac2

Browse files
authored
Merge pull request #280 from krvajal:update-actions
Adds prettier formatting to all files
2 parents 43cad6f + 3308621 commit b04eac2

File tree

9 files changed

+122
-130
lines changed

9 files changed

+122
-130
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ about: Create a report to help us improve
44
title: ''
55
labels: bug
66
assignees: ''
7-
87
---
98

109
**Describe the bug**
1110
A clear and concise description of what the bug is.
1211

1312
**To Reproduce**
1413
Steps to reproduce the behavior:
14+
1515
1. Go to '...'
1616
2. Click on '....'
1717
3. Scroll down to '....'
@@ -27,9 +27,10 @@ A clear and concise description of what you expected to happen.
2727
If applicable, add screenshots to help explain your problem.
2828

2929
**Build info (please complete the following information):**
30-
- OS: [e.g. Linux x64]
31-
- Extension Version [e.g. 2.4.0]
32-
- Visual Studio Code Version [e.g. 1.62.0]
30+
31+
- OS: [e.g. Linux x64]
32+
- Extension Version [e.g. 2.4.0]
33+
- Visual Studio Code Version [e.g. 1.62.0]
3334

3435
**Additional context**
3536
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Suggest an idea for this project
44
title: ''
55
labels: feature-request
66
assignees: ''
7-
87
---
98

109
**Is your feature request related to a problem? Please describe.**

.github/ISSUE_TEMPLATE/syntax-highlighting.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Create a bug report for erroneous syntax highlighting
44
title: ''
55
labels: syntax-highlight
66
assignees: ''
7-
87
---
98

109
**Describe the bug**
@@ -27,9 +26,10 @@ A clear and concise description of what you expected to happen.
2726
Free form (F90+) or Fixed Form (F77)
2827

2928
**Build info (please complete the following information):**
30-
- OS: [e.g. Linux x64]
31-
- Extension Version [e.g. 2.4.0]
32-
- Visual Studio Code Version [e.g. 1.62.0]
29+
30+
- OS: [e.g. Linux x64]
31+
- Extension Version [e.g. 2.4.0]
32+
- Visual Studio Code Version [e.g. 1.62.0]
3333

3434
**Additional context**
3535
Add any other context about the problem here.

.github/dependabot.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: "npm" # See documentation for possible values
9-
directory: "/" # Location of package manifests
8+
- package-ecosystem: 'npm' # See documentation for possible values
9+
directory: '/' # Location of package manifests
1010
schedule:
11-
interval: "weekly"
11+
interval: 'weekly'
1212
assignees:
13-
- "gnikit"
13+
- 'gnikit'
1414
reviewers:
15-
- "gnikit"
15+
- 'gnikit'

.github/workflows/codeql-analysis.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
# the `language` matrix defined below to confirm you have the correct set of
1010
# supported CodeQL languages.
1111
#
12-
name: "CodeQL"
12+
name: 'CodeQL'
1313

1414
on:
1515
push:
16-
branches: [ master ]
16+
branches: [master]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master ]
19+
branches: [master]
2020
schedule:
2121
- cron: '31 20 * * 0'
2222

@@ -32,39 +32,39 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
language: [ 'javascript' ]
35+
language: ['javascript']
3636
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
3737
# Learn more about CodeQL language support at https://git.io/codeql-language-support
3838

3939
steps:
40-
- name: Checkout repository
41-
uses: actions/checkout@v2
40+
- name: Checkout repository
41+
uses: actions/checkout@v2
4242

43-
# Initializes the CodeQL tools for scanning.
44-
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v1
46-
with:
47-
languages: ${{ matrix.language }}
48-
# If you wish to specify custom queries, you can do so here or in a config file.
49-
# By default, queries listed here will override any specified in a config file.
50-
# Prefix the list here with "+" to use these queries and those in the config file.
51-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v1
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
51+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5252

53-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54-
# If this step fails, then you should remove it and run the build manually (see below)
55-
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v1
53+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54+
# If this step fails, then you should remove it and run the build manually (see below)
55+
- name: Autobuild
56+
uses: github/codeql-action/autobuild@v1
5757

58-
# ℹ️ Command-line programs to run using the OS shell.
59-
# 📚 https://git.io/JvXDl
58+
# ℹ️ Command-line programs to run using the OS shell.
59+
# 📚 https://git.io/JvXDl
6060

61-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62-
# and modify them (or add more) to build your code if your project
63-
# uses a compiled language
61+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62+
# and modify them (or add more) to build your code if your project
63+
# uses a compiled language
6464

65-
#- run: |
66-
# make bootstrap
67-
# make release
65+
#- run: |
66+
# make bootstrap
67+
# make release
6868

69-
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v1
69+
- name: Perform CodeQL Analysis
70+
uses: github/codeql-action/analyze@v1

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# .prettierignore
22

33
node_modules
4+
.vscode-test
45
dist
56
out

.vscode/launch.json

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,28 @@
11
{
2-
// Use IntelliSense to learn about possible attributes.
3-
// Hover to view descriptions of existing attributes.
4-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5-
"version": "0.2.0",
6-
"configurations": [
7-
{
8-
"name": "Launch Extension",
9-
"type": "extensionHost",
10-
"request": "launch",
11-
"args": [
12-
"--extensionDevelopmentPath=${workspaceFolder}"
13-
],
14-
"outFiles": [
15-
"${workspaceFolder}/out/src/**/*.js"
16-
],
17-
"preLaunchTask": "npm: watch-dev",
18-
},
19-
{
20-
"name": "Launch Tests",
21-
"type": "extensionHost",
22-
"request": "launch",
23-
"runtimeExecutable": "${execPath}",
24-
"args": [
25-
"--extensionDevelopmentPath=${workspaceFolder}",
26-
"--extensionTestsPath=${workspaceFolder}/out/test"
27-
],
28-
"outFiles": [
29-
"${workspaceFolder}/out/test/**/*.js"
30-
],
31-
"preLaunchTask": "npm: pretest setup",
32-
},
33-
]
34-
}
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Launch Extension",
9+
"type": "extensionHost",
10+
"request": "launch",
11+
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
12+
"outFiles": ["${workspaceFolder}/out/src/**/*.js"],
13+
"preLaunchTask": "npm: watch-dev"
14+
},
15+
{
16+
"name": "Launch Tests",
17+
"type": "extensionHost",
18+
"request": "launch",
19+
"runtimeExecutable": "${execPath}",
20+
"args": [
21+
"--extensionDevelopmentPath=${workspaceFolder}",
22+
"--extensionTestsPath=${workspaceFolder}/out/test"
23+
],
24+
"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
25+
"preLaunchTask": "npm: pretest setup"
26+
}
27+
]
28+
}

.vscode/tasks.json

Lines changed: 50 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,51 @@
11
{
2-
"version": "2.0.0",
3-
"tasks": [
4-
{
5-
"label": "npm: watch-dev",
6-
"type": "npm",
7-
"script": "watch-dev",
8-
"group": {
9-
"kind": "build",
10-
"isDefault": true
11-
},
12-
"isBackground": true,
13-
"problemMatcher": "$tsc-watch",
14-
"detail": "tsc -watch -p tsconfig.json"
15-
},
16-
{
17-
"label": "npm: compile-dev",
18-
"type": "npm",
19-
"script": "compile-dev",
20-
"group": "build",
21-
"problemMatcher": "$tsc",
22-
"detail": "tsc -p tsconfig.json"
23-
},
24-
{
25-
"label": "npm: pretest",
26-
"type": "npm",
27-
"script": "pretest",
28-
"group": "test",
29-
"problemMatcher": "$tsc",
30-
"detail": "tsc -p tsconfig.test.json"
31-
},
32-
{
33-
"label": "npm: pretest setup",
34-
"type": "shell",
35-
"dependsOn": [
36-
"npm: compile-dev",
37-
"npm: pretest"
38-
],
39-
"dependsOrder": "sequence",
40-
"group": {
41-
"kind": "test",
42-
"isDefault": true
43-
},
44-
"detail": "setup for test launch"
45-
},
46-
{
47-
"type": "npm",
48-
"script": "lint",
49-
"problemMatcher": "$eslint-stylish",
50-
"label": "npm: lint",
51-
"detail": "eslint . --ext .ts,.tsx"
52-
}
53-
]
54-
}
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "npm: watch-dev",
6+
"type": "npm",
7+
"script": "watch-dev",
8+
"group": {
9+
"kind": "build",
10+
"isDefault": true
11+
},
12+
"isBackground": true,
13+
"problemMatcher": "$tsc-watch",
14+
"detail": "tsc -watch -p tsconfig.json"
15+
},
16+
{
17+
"label": "npm: compile-dev",
18+
"type": "npm",
19+
"script": "compile-dev",
20+
"group": "build",
21+
"problemMatcher": "$tsc",
22+
"detail": "tsc -p tsconfig.json"
23+
},
24+
{
25+
"label": "npm: pretest",
26+
"type": "npm",
27+
"script": "pretest",
28+
"group": "test",
29+
"problemMatcher": "$tsc",
30+
"detail": "tsc -p tsconfig.test.json"
31+
},
32+
{
33+
"label": "npm: pretest setup",
34+
"type": "shell",
35+
"dependsOn": ["npm: compile-dev", "npm: pretest"],
36+
"dependsOrder": "sequence",
37+
"group": {
38+
"kind": "test",
39+
"isDefault": true
40+
},
41+
"detail": "setup for test launch"
42+
},
43+
{
44+
"type": "npm",
45+
"script": "lint",
46+
"problemMatcher": "$eslint-stylish",
47+
"label": "npm: lint",
48+
"detail": "eslint . --ext .ts,.tsx"
49+
}
50+
]
51+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
"test:grammar-update": "npm run test:grammar-free -- -u && npm run test:grammar-fixed -- -u",
222222
"lint": "eslint . --ext .ts,.tsx",
223223
"lint-fix": "npm run lint -- --fix",
224-
"format": "prettier --write 'src/**/*.{ts,json}' 'test/**/*.ts' 'syntaxes/**/*.json' 'snippets/**/*.json' '*.{md,json}'"
224+
"format": "prettier --write 'src/**/*.{ts,json}' 'test/**/*.ts' 'syntaxes/**/*.json' 'snippets/**/*.json' './**/*.{md,json,yaml,yml}'"
225225
},
226226
"devDependencies": {
227227
"@types/glob": "^7.2.0",

0 commit comments

Comments
 (0)