Skip to content

Commit bdaeb12

Browse files
committed
refactor(service): refactor mpx service plugins
1 parent 358b0a8 commit bdaeb12

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

inspect-extension/components/script-json/demo01/index.mpx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ createPage({})
1111
<script type="application/json">
1212
{
1313
"usingComponents": {
14-
"list": "../components/list"
14+
// 注释测试
15+
"list": "../components/list",
16+
"sd": "xxc", // 允许末行尾随逗号
1517
}
1618
}
1719
</script>

packages/language-service/src/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import type { IRequests } from '@mpxjs/typescript-plugin/src/requests'
55
import type { LanguageServicePlugin } from '@volar/language-service'
66
import { parse } from '@mpxjs/language-core'
77
import { create as createEmmetPlugin } from 'volar-service-emmet'
8-
import { create as createJsonPlugin } from 'volar-service-json'
98
import { create as createTypeScriptSyntacticPlugin } from 'volar-service-typescript/lib/plugins/syntactic'
109
import { create as createTypeScriptDocCommentTemplatePlugin } from 'volar-service-typescript/lib/plugins/docCommentTemplate'
1110
import { create as creatempxDocumentHighlightsPlugin } from './plugins/mpx-document-highlights'
1211
import { create as createMpxSfcPlugin } from './plugins/mpx-sfc'
13-
import { create as createMpxTemplatePlugin } from './plugins/mpx-template'
12+
import { create as createMpxTemplatePlugin } from './plugins/mpx-sfc-template'
13+
import { create as createMpxCSSPlugin } from './plugins/mpx-sfc-css'
14+
import { create as createMpxJsonJsonPlugin } from './plugins/mpx-sfc-json-json'
1415
import { create as createMpxDocumentLinksPlugin } from './plugins/mpx-document-links'
15-
import { create as createCSSPlugin } from './plugins/css'
1616
import { Commands } from './types'
1717

1818
export * from '@volar/language-service'
@@ -53,9 +53,9 @@ function getCommonLanguageServicePlugins(
5353
return [
5454
createMpxSfcPlugin(),
5555
createMpxTemplatePlugin(),
56+
createMpxCSSPlugin(),
57+
createMpxJsonJsonPlugin(),
5658
createMpxDocumentLinksPlugin(),
57-
createCSSPlugin(),
58-
createJsonPlugin(),
5959
createEmmetPlugin({
6060
mappedLanguages: {
6161
'mpx-root-tags': 'html',
File renamed without changes.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import type { LanguageServicePlugin } from '@volar/language-service'
2+
import { create as baseCreate } from 'volar-service-json'
3+
4+
export function create(): LanguageServicePlugin {
5+
const base = baseCreate({
6+
getDocumentLanguageSettings: () => {
7+
// mpx script-json json 语法模块允许注释和尾随逗号
8+
return { comments: 'ignore', trailingCommas: 'ignore' }
9+
},
10+
})
11+
12+
return base
13+
}
File renamed without changes.

0 commit comments

Comments
 (0)