Skip to content

Commit

Permalink
refactor: Migrate format tests to Scripts API (#3133)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnsoncodehk committed May 6, 2023
1 parent 0364210 commit b188686
Show file tree
Hide file tree
Showing 84 changed files with 623 additions and 460 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -22,7 +22,7 @@
},
"devDependencies": {
"@types/node": "latest",
"@volar/language-service": "1.5.1",
"@volar/language-service": "1.5.3",
"typescript": "latest",
"vite": "latest",
"vitest": "0.25.8"
Expand Down
4 changes: 2 additions & 2 deletions packages/vscode-vue/package.json
Expand Up @@ -741,8 +741,8 @@
"devDependencies": {
"@types/semver": "^7.3.13",
"@types/vscode": "1.67.0",
"@volar/source-map": "1.5.1",
"@volar/vscode": "1.5.1",
"@volar/source-map": "1.5.3",
"@volar/vscode": "1.5.3",
"@volar/vue-language-core": "1.6.4",
"@volar/vue-language-server": "1.6.4",
"esbuild": "0.15.18",
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-component-meta/package.json
Expand Up @@ -13,7 +13,7 @@
"directory": "packages/vue-component-meta"
},
"dependencies": {
"@volar/language-core": "1.5.1",
"@volar/language-core": "1.5.3",
"@volar/vue-language-core": "1.6.4",
"typesafe-path": "^0.2.2",
"vue-component-type-helpers": "1.6.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-core/package.json
Expand Up @@ -13,8 +13,8 @@
"directory": "packages/vue-language-core"
},
"dependencies": {
"@volar/language-core": "1.5.1",
"@volar/source-map": "1.5.1",
"@volar/language-core": "1.5.3",
"@volar/source-map": "1.5.3",
"@vue/compiler-dom": "^3.3.0-beta.3",
"@vue/compiler-sfc": "^3.3.0-beta.3",
"@vue/reactivity": "^3.3.0-beta.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/vue-language-plugin-pug/package.json
Expand Up @@ -16,8 +16,8 @@
"@volar/vue-language-core": "1.6.4"
},
"dependencies": {
"@volar/language-service": "1.5.1",
"@volar/source-map": "1.5.1",
"@volar/language-service": "1.5.3",
"@volar/source-map": "1.5.3",
"volar-service-pug": "0.0.1"
}
}
4 changes: 2 additions & 2 deletions packages/vue-language-server/package.json
Expand Up @@ -16,8 +16,8 @@
"directory": "packages/vue-language-server"
},
"dependencies": {
"@volar/language-core": "1.5.1",
"@volar/language-server": "1.5.1",
"@volar/language-core": "1.5.3",
"@volar/language-server": "1.5.3",
"@volar/vue-language-core": "1.6.4",
"@volar/vue-language-service": "1.6.4",
"vscode-languageserver-protocol": "^3.17.3",
Expand Down
9 changes: 6 additions & 3 deletions packages/vue-language-service/package.json
Expand Up @@ -17,9 +17,9 @@
"update-html-data": "node ./scripts/update-html-data.js"
},
"dependencies": {
"@volar/language-core": "1.5.1",
"@volar/language-service": "1.5.1",
"@volar/source-map": "1.5.1",
"@volar/language-core": "1.5.3",
"@volar/language-service": "1.5.3",
"@volar/source-map": "1.5.3",
"@volar/vue-language-core": "1.6.4",
"@vue/compiler-dom": "^3.3.0-beta.3",
"@vue/reactivity": "^3.3.0-beta.3",
Expand All @@ -37,5 +37,8 @@
"vscode-languageserver-protocol": "^3.17.3",
"vscode-languageserver-textdocument": "^1.0.8",
"vscode-uri": "^3.0.7"
},
"devDependencies": {
"@volar/kit": "1.5.3"
}
}
42 changes: 0 additions & 42 deletions packages/vue-language-service/tests/format.ts

This file was deleted.

20 changes: 20 additions & 0 deletions packages/vue-language-service/tests/format/1210.spec.ts
@@ -0,0 +1,20 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<script setup lang="ts">
import { ref } from "vue";
const count = ref(0);
</script>
<template>
<button @click="count++">{{ count }}</button>
</template>
`.trim(),
settings: {
'typescript.format.semicolons': 'insert'
},
});
14 changes: 14 additions & 0 deletions packages/vue-language-service/tests/format/1398.spec.ts
@@ -0,0 +1,14 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<template>
<div v-for="i in list">{{ i }}</div>
</template>
`.trim(),
settings: {
'javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis': true
},
});
49 changes: 49 additions & 0 deletions packages/vue-language-service/tests/format/1806.spec.ts
@@ -0,0 +1,49 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<template>
<div>
<div>
</div>
</div>
</template>
<script>
export { }
</script>
<style>
.foo {
color: #000;
}
</style>
`.trim(),
output: `
<template>
<div>
<div>
</div>
</div>
</template>
<script>
export { }
</script>
<style>
.foo {
color: #000;
}
</style>
`.trim(),
settings: {
'volar.format.initialIndent': {
html: false,
javascript: true,
css: true
}
},
});
20 changes: 20 additions & 0 deletions packages/vue-language-service/tests/format/1823.spec.ts
@@ -0,0 +1,20 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<script>
function foo(params) {
console.log('foo');
}
</script>
`.trim(),
output: `
<script>
function foo(params) {
console.log('foo');
}
</script>
`.trim(),
});
18 changes: 18 additions & 0 deletions packages/vue-language-service/tests/format/2026.spec.ts
@@ -0,0 +1,18 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<template>
<span :class="['class1','class2',{'class3':!modelValue}]">{{
$i18n('i18n-key')}}</span>
</template>
`.trim(),
output: `
<template>
<span :class="['class1', 'class2', { 'class3': !modelValue }]">{{
$i18n('i18n-key') }}</span>
</template>
`.trim(),
});
24 changes: 24 additions & 0 deletions packages/vue-language-service/tests/format/2105.spec.ts
@@ -0,0 +1,24 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<template></template>
<style>
a {
background: v-bind(' props.background|| "var(--primary-lighter)"');
}
</style>
`.trim(),
output: `
<template></template>
<style>
a {
background: v-bind('props.background || "var(--primary-lighter)"');
}
</style>
`.trim(),
});
16 changes: 16 additions & 0 deletions packages/vue-language-service/tests/format/2305.spec.ts
@@ -0,0 +1,16 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<template>
{{a?b:c}}
</template>
`.trim(),
output: `
<template>
{{ a ? b : c }}
</template>
`.trim(),
});
16 changes: 16 additions & 0 deletions packages/vue-language-service/tests/format/2350.spec.ts
@@ -0,0 +1,16 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<template>
{{title}}
</template>
`.trim(),
output: `
<template>
{{ title }}
</template>
`.trim(),
});
11 changes: 11 additions & 0 deletions packages/vue-language-service/tests/format/2385.spec.ts
@@ -0,0 +1,11 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<script>
export { }
</script>
`.trim().replace('\n', '\r\n'), // CRLF
});
20 changes: 20 additions & 0 deletions packages/vue-language-service/tests/format/2390.spec.ts
@@ -0,0 +1,20 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<template>
<!-- hello -->
<img alt="Vue logo" src="./assets/logo.png" />
<HelloWorld msg="Hello Vue 3 + TypeScript + Vite" />
</template>
`.trim(),
output: `
<template>
<!-- hello -->
<img alt="Vue logo" src="./assets/logo.png" />
<HelloWorld msg="Hello Vue 3 + TypeScript + Vite" />
</template>
`.trim(),
});
22 changes: 22 additions & 0 deletions packages/vue-language-service/tests/format/2393.spec.ts
@@ -0,0 +1,22 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<template>
<div>
<div>
</div>
</div>
</template>
`.trim(),
output: `
<template>
<div>
<div>
</div>
</div>
</template>
`.trim(),
});
8 changes: 8 additions & 0 deletions packages/vue-language-service/tests/format/2480.spec.ts
@@ -0,0 +1,8 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'typescript',
input: ` export { };`,
output: `export { };`,
});
15 changes: 15 additions & 0 deletions packages/vue-language-service/tests/format/2505.spec.ts
@@ -0,0 +1,15 @@
import { defineFormatTest } from '../utils/format';

defineFormatTest({
title: '#' + __filename.split('.')[0],
languageId: 'vue',
input: `
<script setup lang="ts"></script>
<template>
<!--
hey
-->
</template>
`.trim(),
});

0 comments on commit b188686

Please sign in to comment.