Skip to content
Open
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
6 changes: 1 addition & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
"tsconfigRootDir": "."
},
"plugins": ["@typescript-eslint"],
"extends": [
"eslint:recommended",
"prettier",
"plugin:@typescript-eslint/recommended"
],
"extends": ["eslint:recommended", "prettier", "plugin:@typescript-eslint/recommended"],
"rules": {
// Possible Errors
"no-async-promise-executor": "error",
Expand Down
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ Please fill-in this template.
Delete the following condition if it doesn't apply to your case:

If the extension is not picking up the expected configuration for a file:

- [ ] I tried `npm install editorconfig -g` and ran `editorconfig [file-in-question]` and the configuration was what I expected. If not, please file on the [`editorconfig-core-js` issue tracker](https://github.com/editorconfig/editorconfig-core-js/issues).

## Issue

| | Visual Studio Code | editorconfig-vscode |
|-------------|--------------------|---------------------|
| ----------- | ------------------ | ------------------- |
| **Version** | `x.x.x` | `x.x.x` |

### Root `.editorconfig` File
Expand All @@ -27,7 +28,7 @@ indent_size = 2
Are there any other relevant `.editorconfig` files in your project? Yes / No

| Visual Studio Code Setting | Default | User | Workspace |
|--------------------------------|---------|---------|-----------|
| ------------------------------ | ------- | ------- | --------- |
| `editor.insertSpaces` | `true` | `____` | `____` |
| `editor.tabSize` | `4` | `_` | `_` |
| `editor.trimAutoWhitespace` | `true` | `____` | `____` |
Expand Down
4 changes: 4 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"printWidth": 100,
"quoteProps": "consistent"
}
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

[actions-img]: https://github.com/editorconfig/editorconfig-vscode/actions/workflows/test.yml/badge.svg
[actions]: https://github.com/editorconfig/editorconfig-vscode/actions
[chat-img]:
https://img.shields.io/badge/Gitter-Join_the_EditorConfig_VSCode_chat-brightgreen.png?style=flat-square
[chat-img]: https://img.shields.io/badge/Gitter-Join_the_EditorConfig_VSCode_chat-brightgreen.png?style=flat-square
[chat]: https://gitter.im/editorconfig/editorconfig-vscode

This plugin [attempts](#known-issues) to override user/workspace settings with
Expand Down
89 changes: 4 additions & 85 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 4 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,23 +118,23 @@
"@typescript-eslint/eslint-plugin": "^8.34.0",
"@typescript-eslint/parser": "^8.34.0",
"@vscode/test-electron": "^2.5.2",
"@vscode/vsce": "^3.5.0",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unrelated change

"eslint": "^8.57.1",
"eslint-config-prettier": "^10.1.5",
"eslint-config-xo": "^0.45.0",
"eslint-plugin-prettier": "^5.4.1",
"glob": "^11.0.2",
"mocha": "^11.6.0",
"prettier": "^3.5.3",
"prettier": "^3.8.1",
"rimraf": "^6.0.1",
"typescript": "~5.8.3",
"@vscode/vsce": "^3.5.0",
"vscode-test-utils": "^1.0.0"
},
"scripts": {
"clean": "rimraf out",
"prebuild": "npm run clean",
"build": "tsc",
"postbuild": "cp -r src/test/suite/fixtures out/test/suite && cp -r src/test/untitled-suite/fixtures out/test/untitled-suite && cp src/DefaultTemplate.editorconfig out",
"format": "prettier --write .",
"lint": "eslint src/**/*.ts",
"pretest": "npm run lint && npm run build",
"watch": "tsc -watch",
Expand All @@ -153,16 +153,6 @@
},
"rules": {
"prettier/prettier": "error"
},
"plugins": [
"prettier"
]
},
"prettier": {
"arrowParens": "avoid",
"proseWrap": "always",
"semi": false,
"singleQuote": true,
"trailingComma": "all"
}
}
}
Loading
Loading