Skip to content
Merged
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
11 changes: 0 additions & 11 deletions .oxlintrc.json

This file was deleted.

9 changes: 2 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@
"test": "vitest run",
"test:update": "vitest run --update",
"format": "dprint fmt",
"lint": "pnpm run oxlint && pnpm run tsslint",
"lint:fix": "pnpm run oxlint:fix && pnpm run tsslint:fix && npm run format",
"oxlint": "oxlint",
"oxlint:fix": "oxlint --fix",
"tsslint": "tsslint --project {tsconfig.json,packages/*/tsconfig.json,extensions/*/tsconfig.json}",
"tsslint:fix": "pnpm run lint -- --fix"
"lint": "tsslint --project {tsconfig.json,packages/*/tsconfig.json,extensions/*/tsconfig.json}",
"lint:fix": "pnpm run lint -- --fix"
},
"devDependencies": {
"@lerna-lite/cli": "^4.1.2",
Expand All @@ -27,7 +23,6 @@
"@tsslint/eslint": "^2.0.1",
"@typescript-eslint/eslint-plugin": "^8.19.0",
"dprint": "^0.50.0",
"oxlint": "^1.0.0",
"typescript": "latest",
"vitest": "^3.1.3"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/language-core/lib/codegen/script/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function* generateComponent(
yield `})`;
}

export function* generateComponentSetupReturns(scriptSetupRanges: ScriptSetupRanges): Generator<Code> {
export function* generateComponentSetupReturns(scriptSetupRanges: ScriptSetupRanges): Generator<string> {
// fill $props
if (scriptSetupRanges.defineProps) {
const name = scriptSetupRanges.defineProps.name ?? `__VLS_props`;
Expand Down
3 changes: 2 additions & 1 deletion packages/language-server/tests/inlayHints.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,8 @@ async function requestInlayHintsResult(fileName: string, languageId: string, con
let text = document.getText();
for (const hint of inlayHints!.sort((a, b) => document.offsetAt(b.position) - document.offsetAt(a.position))) {
const offset = document.offsetAt(hint.position);
text = text.slice(0, offset) + '/* ' + hint.label + ' */' + text.slice(offset);
const label = Array.isArray(hint.label) ? hint.label.map(part => part.value).join('') : hint.label;
text = text.slice(0, offset) + '/* ' + label + ' */' + text.slice(offset);
}

return text;
Expand Down
1 change: 0 additions & 1 deletion packages/language-service/lib/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export function loadTemplateData(lang: string) {

resolveReferences(data);

// oxlint-disable-next-line no-useless-spread
for (const attr of [...data.globalAttributes ?? []]) {
if (!attr.name.startsWith('v-')) {
data.globalAttributes?.push(
Expand Down
Loading
Loading