vitalif
/
prettier
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: update editorconfig-to-prettier (#5550)

master
Ika 2018-11-26 13:08:52 +08:00 committed by GitHub
parent a7528ebea4
commit 99a3efaa7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -29,7 +29,7 @@
"dedent": "0.7.0",
"diff": "3.2.0",
"editorconfig": "0.15.2",
"editorconfig-to-prettier": "0.1.0",
"editorconfig-to-prettier": "0.1.1",
"emoji-regex": "6.5.1",
"escape-string-regexp": "1.0.5",
"esutils": "2.0.2",

10
tests_integration/__tests__/config-resolution.js
View File

@ -150,6 +150,16 @@ test("API resolveConfig.sync with file arg and .editorconfig", () => {
});
});
test("API resolveConfig.sync with file arg and .editorconfig (key = unset)", () => {
const file = path.resolve(
path.join(__dirname, "../cli/config/editorconfig/tab_width=unset.js")
);
expect(
prettier.resolveConfig.sync(file, { editorconfig: true })
).not.toMatchObject({ tabWidth: "unset" });
});
test("API resolveConfig with nested file arg and .editorconfig", () => {
const file = path.resolve(
path.join(__dirname, "../cli/config/editorconfig/lib/file.js")

5
tests_integration/cli/config/editorconfig/.editorconfig
View File

@ -12,4 +12,7 @@ indent_style = space
indent_size = 2
[lib/indent_size=tab.js]
indent_size = tab
indent_size = tab
[tab_width=unset.js]
tab_width = unset

6
yarn.lock
View File

@ -1815,9 +1815,9 @@ ecc-jsbn@~0.1.1:
dependencies:
jsbn "~0.1.0"
editorconfig-to-prettier@0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/editorconfig-to-prettier/-/editorconfig-to-prettier-0.1.0.tgz#c31d2ceea2ef922835c53f6ca0e5ba2930b8940d"
editorconfig-to-prettier@0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/editorconfig-to-prettier/-/editorconfig-to-prettier-0.1.1.tgz#7391c7067dfd68ffee65afc2c4fbe4fba8d4219a"
editorconfig@0.15.2:
version "0.15.2"