Skip to content

Commit

Permalink
Remove some non-default Prettier settings (#213)
Browse files Browse the repository at this point in the history
  • Loading branch information
charliermarsh authored Jun 15, 2023
1 parent 0d374ea commit 02076b0
Show file tree
Hide file tree
Showing 28 changed files with 8,641 additions and 8,603 deletions.
34 changes: 17 additions & 17 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"plugins": ["@typescript-eslint", "prettier"],
"rules": {
"prettier/prettier": "error",
"@typescript-eslint/naming-convention": "warn",
"@typescript-eslint/semi": "warn",
"curly": "warn",
"eqeqeq": ["warn", "smart"],
"no-throw-literal": "warn",
"semi": "off"
},
"ignorePatterns": ["out", "dist", "**/*.d.ts"]
"root": true,
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"plugins": ["@typescript-eslint", "prettier"],
"rules": {
"prettier/prettier": "error",
"@typescript-eslint/naming-convention": "warn",
"@typescript-eslint/semi": "warn",
"curly": "warn",
"eqeqeq": ["warn", "smart"],
"no-throw-literal": "warn",
"semi": "off"
},
"ignorePatterns": ["out", "dist", "**/*.d.ts"]
}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
runs-on: ubuntu-latest
steps:
- uses: extractions/setup-just@v1
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
# We have to do this ahead-of-time, and store it as a job output,
# to ensure that we use the same Build ID across all build jobs.
build-id:
name: 'Build ID'
name: "Build ID"
runs-on: ubuntu-latest
outputs:
RELEASE_BUILD_ID: ${{ steps.release-build-id-generator.outputs.BUILD_ID }}
Expand All @@ -24,7 +24,7 @@ jobs:
fetch-depth: ${{ env.FETCH_DEPTH }}
- uses: actions/setup-python@v4
with:
python-version: '3.x'
python-version: "3.x"
- name: Generate Build ID (release)
if: "startsWith(github.ref, 'refs/tags/')"
id: release-build-id-generator
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
code-target: darwin-arm64

name: Build (${{ matrix.target }})
needs: ['build-id']
needs: ["build-id"]
runs-on: ${{ matrix.os }}
container: ${{ matrix.container }}

Expand All @@ -83,7 +83,7 @@ jobs:
# Install Python dependencies (including Ruff's native binary).
- uses: actions/setup-python@v4
with:
python-version: '3.x'
python-version: "3.x"
- run: python -m pip install -t ./bundled/libs --implementation py --no-deps --upgrade -r ./requirements.txt
if: ${{ !startsWith(matrix.os, 'ubuntu') || startsWith(matrix.target, 'x86_64') }}
- uses: uraimo/run-on-arch-action@v2
Expand Down Expand Up @@ -134,8 +134,8 @@ jobs:

# Phase 3: Publish the built extension to the Marketplace.
publish:
name: 'Publish'
needs: ['build']
name: "Publish"
needs: ["build"]
runs-on: ubuntu-latest
steps:
- name: Install Nodejs
Expand Down
12 changes: 12 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
out
dist
node_modules
.vscode-test/
*.vsix
.venv/
.vs/
.nox/
bundled/libs/
**/__pycache__
**/.pytest_cache
**/.vs
15 changes: 0 additions & 15 deletions .prettierrc.js

This file was deleted.

5 changes: 5 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"printWidth": 100,
"tabWidth": 2,
"trailingComma": "all"
}
162 changes: 81 additions & 81 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,85 +3,85 @@
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
{
"version": "0.2.0",
"configurations": [
{
"name": "Debug Extension Only",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "npm: watch",
"env": {
"DEBUGPY_ENABLED": "False"
},
"presentation": {
"hidden": false,
"group": "",
"order": 2
}
},
{
"name": "Python Attach",
"type": "python",
"request": "attach",
"processId": "${command:pickProcess}",
"justMyCode": false,
"presentation": {
"hidden": false,
"group": "",
"order": 3
}
},
{
"name": "Python Test Debug",
"type": "python",
"request": "launch",
"console": "integratedTerminal",
"purpose": ["debug-test"],
"justMyCode": true,
"presentation": {
"hidden": true,
"group": "",
"order": 4
}
},
{
"name": "Debug Extension",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"presentation": {
"hidden": true,
"group": "",
"order": 4
}
},
{
"name": "Python Server",
"type": "python",
"request": "attach",
"listen": { "host": "localhost", "port": 5678 },
"justMyCode": true,
"presentation": {
"hidden": true,
"group": "",
"order": 4
}
}
],
"compounds": [
{
"name": "Debug Extension and Python",
"configurations": ["Python Server", "Debug Extension"],
"stopAll": true,
"preLaunchTask": "npm: watch",
"presentation": {
"hidden": false,
"group": "",
"order": 1
}
}
]
"version": "0.2.0",
"configurations": [
{
"name": "Debug Extension Only",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "npm: watch",
"env": {
"DEBUGPY_ENABLED": "False"
},
"presentation": {
"hidden": false,
"group": "",
"order": 2
}
},
{
"name": "Python Attach",
"type": "python",
"request": "attach",
"processId": "${command:pickProcess}",
"justMyCode": false,
"presentation": {
"hidden": false,
"group": "",
"order": 3
}
},
{
"name": "Python Test Debug",
"type": "python",
"request": "launch",
"console": "integratedTerminal",
"purpose": ["debug-test"],
"justMyCode": true,
"presentation": {
"hidden": true,
"group": "",
"order": 4
}
},
{
"name": "Debug Extension",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"presentation": {
"hidden": true,
"group": "",
"order": 4
}
},
{
"name": "Python Server",
"type": "python",
"request": "attach",
"listen": { "host": "localhost", "port": 5678 },
"justMyCode": true,
"presentation": {
"hidden": true,
"group": "",
"order": 4
}
}
],
"compounds": [
{
"name": "Debug Extension and Python",
"configurations": ["Python Server", "Debug Extension"],
"stopAll": true,
"preLaunchTask": "npm: watch",
"presentation": {
"hidden": false,
"group": "",
"order": 1
}
}
]
}
34 changes: 16 additions & 18 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
// Place your settings in this file to overwrite default and user settings.
{
"files.exclude": {
"out": false, // set this to true to hide the "out" folder with the compiled JS files
"dist": false // set this to true to hide the "dist" folder with the compiled JS files
},
"search.exclude": {
"out": true, // set this to false to include "out" folder in search results
"dist": true // set this to false to include "dist" folder in search results
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off",
"python.testing.pytestArgs": ["src/test/python_tests"],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"python.testing.cwd": "${workspaceFolder}",
"python.analysis.extraPaths": [
"bundled/libs"
],
"python.formatting.provider": "black"
"files.exclude": {
"out": false, // set this to true to hide the "out" folder with the compiled JS files
"dist": false // set this to true to hide the "dist" folder with the compiled JS files
},
"search.exclude": {
"out": true, // set this to false to include "out" folder in search results
"dist": true // set this to false to include "dist" folder in search results
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off",
"python.testing.pytestArgs": ["src/test/python_tests"],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"python.testing.cwd": "${workspaceFolder}",
"python.analysis.extraPaths": ["bundled/libs"],
"python.formatting.provider": "black"
}
Loading

0 comments on commit 02076b0

Please sign in to comment.