Skip to content

Commit 5f4c1e7

Browse files
authored
refactor: improve code consistency (vuejs#4976)
1 parent 4c3c8c4 commit 5f4c1e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+231
-253
lines changed

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"typescript.format.semicolons": "insert",
33
"editor.insertSpaces": false,
44
"editor.detectIndentation": false,
5+
"editor.codeActionsOnSave": {
6+
"source.organizeImports": "always"
7+
},
58
"json.format.keepLines": true,
69
"typescript.tsdk": "node_modules/typescript/lib",
710
"[typescript]": {

extensions/vscode/src/compatibility.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import * as vscode from 'vscode';
2-
import * as semver from 'semver';
31
import { computed, useAllExtensions } from 'reactive-vscode';
2+
import * as semver from 'semver';
3+
import * as vscode from 'vscode';
44

55
const extensions = useAllExtensions();
66

extensions/vscode/src/hybridMode.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import * as path from 'node:path';
21
import * as fs from 'node:fs';
2+
import * as path from 'node:path';
3+
import { computed, executeCommand, ref, useAllExtensions, useVscodeContext, watchEffect } from "reactive-vscode";
34
import * as semver from 'semver';
45
import * as vscode from 'vscode';
5-
import { computed, executeCommand, ref, useAllExtensions, useVscodeContext, watchEffect } from "reactive-vscode";
66
import { incompatibleExtensions, unknownExtensions } from './compatibility';
77
import { config } from './config';
88

extensions/vscode/src/languageClient.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import {
44
executeCommand,
55
nextTick,
66
useActiveTextEditor,
7-
useVisibleTextEditors,
8-
useOutputChannel,
97
useCommand,
8+
useOutputChannel,
9+
useVisibleTextEditors,
1010
useVscodeContext,
1111
watch,
1212
} from 'reactive-vscode';

extensions/vscode/src/middleware.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import * as lsp from '@volar/vscode';
12
import { AttrNameCasing, TagNameCasing } from '@vue/language-server/lib/types';
23
import * as vscode from 'vscode';
3-
import * as lsp from '@volar/vscode';
4-
import { attrNameCasings, tagNameCasings } from './features/nameCasing';
54
import { config } from './config';
5+
import { attrNameCasings, tagNameCasings } from './features/nameCasing';
66

77
export const middleware: lsp.Middleware = {
88
...lsp.middleware,

extensions/vscode/src/nodeClientMain.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { createLabsInfo } from '@volar/vscode';
2+
import * as lsp from '@volar/vscode/node';
23
import * as protocol from '@vue/language-server/protocol';
34
import * as fs from 'fs';
4-
import * as vscode from 'vscode';
5-
import * as lsp from '@volar/vscode/node';
65
import { defineExtension, executeCommand, extensionContext, onDeactivate } from 'reactive-vscode';
6+
import * as vscode from 'vscode';
7+
import { config } from './config';
78
import { enabledHybridMode, enabledTypeScriptPlugin } from './hybridMode';
89
import { activate as activateLanguageClient, deactivate as deactivateLanguageClient } from './languageClient';
9-
import { config } from './config';
1010
import { middleware } from './middleware';
1111

1212
export const { activate, deactivate } = defineExtension(async () => {

extensions/vscode/tests/grammar.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as path from 'path';
21
import * as fs from 'fs';
2+
import * as path from 'path';
33
import { describe, expect, it } from 'vitest';
44
import { createGrammarSnapshot } from 'vscode-tmlanguage-snapshot';
55

packages/component-meta/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as ts from 'typescript';
2-
import { createCheckerByJsonConfigBase, createCheckerBase } from './lib/base';
2+
import { createCheckerBase, createCheckerByJsonConfigBase } from './lib/base';
33
import type { MetaCheckerOptions } from './lib/types';
44

55
export * from './lib/types';

packages/component-meta/tests/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from 'path';
22
import { describe, expect, test } from 'vitest';
3-
import { createChecker, createCheckerByJson, MetaCheckerOptions, ComponentMetaChecker, TypeMeta } from '..';
3+
import { ComponentMetaChecker, createChecker, createCheckerByJson, MetaCheckerOptions, TypeMeta } from '..';
44

55
const worker = (checker: ComponentMetaChecker, withTsconfig: boolean) => describe(`vue-component-meta ${withTsconfig ? 'with tsconfig' : 'without tsconfig'}`, () => {
66

packages/language-core/lib/codegen/localTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type * as ts from 'typescript';
22
import { VueCompilerOptions } from '../types';
33
import { getSlotsPropertyName } from '../utils/shared';
4-
import { endOfLine } from './common';
4+
import { endOfLine } from './utils';
55

66
export function getLocalTypesGenerator(compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions) {
77
const used = new Set<string>();

0 commit comments

Comments
 (0)