Skip to content

Adds prettier formatting to all files #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

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

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -27,9 +27,10 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Build info (please complete the following information):**
- OS: [e.g. Linux x64]
- Extension Version [e.g. 2.4.0]
- Visual Studio Code Version [e.g. 1.62.0]

- OS: [e.g. Linux x64]
- Extension Version [e.g. 2.4.0]
- Visual Studio Code Version [e.g. 1.62.0]

**Additional context**
Add any other context about the problem here.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: feature-request
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/syntax-highlighting.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Create a bug report for erroneous syntax highlighting
title: ''
labels: syntax-highlight
assignees: ''

---

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

**Build info (please complete the following information):**
- OS: [e.g. Linux x64]
- Extension Version [e.g. 2.4.0]
- Visual Studio Code Version [e.g. 1.62.0]

- OS: [e.g. Linux x64]
- Extension Version [e.g. 2.4.0]
- Visual Studio Code Version [e.g. 1.62.0]

**Additional context**
Add any other context about the problem here.
10 changes: 5 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
- package-ecosystem: 'npm' # See documentation for possible values
directory: '/' # Location of package manifests
schedule:
interval: "weekly"
interval: 'weekly'
assignees:
- "gnikit"
- 'gnikit'
reviewers:
- "gnikit"
- 'gnikit'
58 changes: 29 additions & 29 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
name: 'CodeQL'

on:
push:
branches: [ master ]
branches: [master]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [master]
schedule:
- cron: '31 20 * * 0'

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

steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Checkout repository
uses: actions/checkout@v2

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

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

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

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

#- run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# .prettierignore

node_modules
.vscode-test
dist
out
60 changes: 27 additions & 33 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch Extension",
"type": "extensionHost",
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/out/src/**/*.js"
],
"preLaunchTask": "npm: watch-dev",
},
{
"name": "Launch Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/out/test"
],
"outFiles": [
"${workspaceFolder}/out/test/**/*.js"
],
"preLaunchTask": "npm: pretest setup",
},
]
}
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch Extension",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/out/src/**/*.js"],
"preLaunchTask": "npm: watch-dev"
},
{
"name": "Launch Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/out/test"
],
"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
"preLaunchTask": "npm: pretest setup"
}
]
}
103 changes: 50 additions & 53 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,54 +1,51 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "npm: watch-dev",
"type": "npm",
"script": "watch-dev",
"group": {
"kind": "build",
"isDefault": true
},
"isBackground": true,
"problemMatcher": "$tsc-watch",
"detail": "tsc -watch -p tsconfig.json"
},
{
"label": "npm: compile-dev",
"type": "npm",
"script": "compile-dev",
"group": "build",
"problemMatcher": "$tsc",
"detail": "tsc -p tsconfig.json"
},
{
"label": "npm: pretest",
"type": "npm",
"script": "pretest",
"group": "test",
"problemMatcher": "$tsc",
"detail": "tsc -p tsconfig.test.json"
},
{
"label": "npm: pretest setup",
"type": "shell",
"dependsOn": [
"npm: compile-dev",
"npm: pretest"
],
"dependsOrder": "sequence",
"group": {
"kind": "test",
"isDefault": true
},
"detail": "setup for test launch"
},
{
"type": "npm",
"script": "lint",
"problemMatcher": "$eslint-stylish",
"label": "npm: lint",
"detail": "eslint . --ext .ts,.tsx"
}
]
}
"version": "2.0.0",
"tasks": [
{
"label": "npm: watch-dev",
"type": "npm",
"script": "watch-dev",
"group": {
"kind": "build",
"isDefault": true
},
"isBackground": true,
"problemMatcher": "$tsc-watch",
"detail": "tsc -watch -p tsconfig.json"
},
{
"label": "npm: compile-dev",
"type": "npm",
"script": "compile-dev",
"group": "build",
"problemMatcher": "$tsc",
"detail": "tsc -p tsconfig.json"
},
{
"label": "npm: pretest",
"type": "npm",
"script": "pretest",
"group": "test",
"problemMatcher": "$tsc",
"detail": "tsc -p tsconfig.test.json"
},
{
"label": "npm: pretest setup",
"type": "shell",
"dependsOn": ["npm: compile-dev", "npm: pretest"],
"dependsOrder": "sequence",
"group": {
"kind": "test",
"isDefault": true
},
"detail": "setup for test launch"
},
{
"type": "npm",
"script": "lint",
"problemMatcher": "$eslint-stylish",
"label": "npm: lint",
"detail": "eslint . --ext .ts,.tsx"
}
]
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
"test:grammar-update": "npm run test:grammar-free -- -u && npm run test:grammar-fixed -- -u",
"lint": "eslint . --ext .ts,.tsx",
"lint-fix": "npm run lint -- --fix",
"format": "prettier --write 'src/**/*.{ts,json}' 'test/**/*.ts' 'syntaxes/**/*.json' 'snippets/**/*.json' '*.{md,json}'"
"format": "prettier --write 'src/**/*.{ts,json}' 'test/**/*.ts' 'syntaxes/**/*.json' 'snippets/**/*.json' './**/*.{md,json,yaml,yml}'"
},
"devDependencies": {
"@types/glob": "^7.2.0",
Expand Down