Skip to content
Draft
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
2 changes: 2 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const { parsers: babelParsers } = require('prettier/parser-babel');
const { parsers: htmlParsers } = require('prettier/parser-html');
const { parsers: svelteParsers } = require('prettier-plugin-svelte');
const { parsers: typescriptParsers } = require('prettier/parser-typescript');

const { organize } = require('./lib/organize');
Expand Down Expand Up @@ -59,6 +60,7 @@ const plugin = {
parsers: {
babel: withOrganizeImportsPreprocess(babelParsers.babel),
'babel-ts': withOrganizeImportsPreprocess(babelParsers['babel-ts']),
svelte: withOrganizeImportsPreprocess(svelteParsers.svelte),
typescript: withOrganizeImportsPreprocess(typescriptParsers.typescript),
vue: withOrganizeImportsPreprocess(htmlParsers.vue),
},
Expand Down
6 changes: 6 additions & 0 deletions lib/get-language-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ const { getTypeScriptLanguageServiceHost, getVueLanguageServiceHost } = require(
* @returns {ts.LanguageService}
*/
const getLanguageService = (parser, filepath, code) => {
if (parser === 'svelte') {
return require('@volar-examples/svelte-typescript').createLanguageService(
getVueLanguageServiceHost(filepath, code),
);
}

if (parser === 'vue') {
return require('@volar/vue-typescript').createLanguageService(getVueLanguageServiceHost(filepath, code));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/organize.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports.organize = (
code,
{ filepath = 'file.ts', organizeImportsSkipDestructiveCodeActions, parentParser, parser },
) => {
if (parentParser === 'vue') {
if (parentParser === 'vue' || parentParser === 'svelte') {
// we already did the preprocessing in the parent parser, so we skip the child parsers
return code;
}
Expand Down
10 changes: 10 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,36 @@
"repository": "simonhaenisch/prettier-plugin-organize-imports",
"homepage": "https://github.com/simonhaenisch/prettier-plugin-organize-imports#readme",
"peerDependencies": {
"@volar-examples/svelte-typescript": "^1.0.4",
"@volar/vue-language-plugin-pug": "^1.0.4",
"@volar/vue-typescript": "^1.0.4",
"prettier": ">=2.0",
"prettier-plugin-svelte": "^2.8.0",
"typescript": ">=2.9"
},
"peerDependenciesMeta": {
"@volar-examples/svelte-typescript": {
"optional": true
},
"@volar/vue-language-plugin-pug": {
"optional": true
},
"@volar/vue-typescript": {
"optional": true
},
"prettier-plugin-svelte": {
"optional": true
}
},
"devDependencies": {
"@types/node": "18.11.9",
"@types/prettier": "2.7.1",
"@volar-examples/svelte-typescript": "1.0.9",
"@volar/vue-language-plugin-pug": "1.0.9",
"@volar/vue-typescript": "1.0.9",
"ava": "3.15.0",
"prettier": "2.7.1",
"prettier-plugin-svelte": "2.8.0",
"typescript": "4.8.4"
},
"prettier": {
Expand Down
26 changes: 26 additions & 0 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,32 @@ Foo
t.is(formattedCode, code);
});

test('has basic Svelte support', (t) => {
const code = `
<script>
import Foo from './Foo.svelte';
import Bar from './Bar.svelte';
import Unused from './Unused.svelte';
</script>

<Foo />
<Bar />
`;

const expectedCode = `<script>
import Bar from "./Bar.svelte";
import Foo from "./Foo.svelte";
</script>

<Foo />
<Bar />
`;

const formattedCode = prettify(code, { plugins: ['prettier-plugin-svelte', '.'], filepath: 'file.svelte' });

t.is(formattedCode, expectedCode);
});

test('does not remove unused imports with `organizeImportsSkipDestructiveCodeActions` enabled', (t) => {
const code = `import { foo } from "./bar";
`;
Expand Down