Skip to content

Commit abef4e0

Browse files
refactor(Cocoon): Standardize import organization and formatting
Restructured import statements across Cocoon services to enforce consistent formatting patterns and improve code readability. Key changes include: - Combined type/value imports using TypeScript 5.0 syntax where applicable - Grouped related imports (Effect-TS, VS Code types, internal services) - Added missing blank lines between import groups for visual separation - Reordered imports to follow logical progression (external -> core -> internal) - Removed redundant import declarations These changes maintain full functional equivalence but enhance maintainability by: 1. Aligning with Effect-TS architectural patterns for service layer organization 2. Preparing codebase for future TypeScript optimizations 3. Improving readability during extension development and debugging 4. Ensuring consistent style across the Cocoon sidecar implementation
1 parent ad580f4 commit abef4e0

61 files changed

Lines changed: 120 additions & 75 deletions

Some content is hidden

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

‎Source/APIDeprecation.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import { Effect } from "effect";
88
import type { ExtensionIdentifier } from "vs/platform/extensions/common/extensions.js";
9+
910
import { LoggerService } from "./Logger.js";
1011

1112
/**

‎Source/APIFactory.ts‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,21 @@ import type {
1212
} from "vs/platform/extensions/common/extensions.js";
1313
import type * as VSCode from "vscode";
1414
import type { Disposable } from "vscode";
15-
import { Position, Range, Selection } from "./Platform/VSCode/Type.js";
1615

1716
// Corrected PascalCase Imports
18-
import { CommandService } from "./Command.js";
19-
import type { Command } from "./Command.js";
17+
import { CommandService, type Command } from "./Command.js";
2018
import { DebugService } from "./Debug.js";
21-
import { ExtensionService } from "./Extension.js";
22-
import type { Extension } from "./Extension.js";
19+
import { ExtensionService, type Extension } from "./Extension.js";
2320
import { LanguageFeatureService } from "./LanguageFeature.js";
24-
import { LoggerService } from "./Logger.js";
25-
import type { Logger } from "./Logger.js";
21+
import { LoggerService, type Logger } from "./Logger.js";
22+
import { Position, Range, Selection } from "./Platform/VSCode/Type.js";
2623
import { ProposedAPIService } from "./ProposedAPI.js";
27-
import { StatusBarService } from "./StatusBar.js";
28-
import type { StatusBar } from "./StatusBar.js";
24+
import { StatusBarService, type StatusBar } from "./StatusBar.js";
2925
import { TaskService } from "./Task.js";
30-
import { TreeViewService } from "./TreeView.js";
31-
import type { TreeView } from "./TreeView.js";
32-
import { WebViewPanelService } from "./WebViewPanel.js";
33-
import type { WebViewPanel } from "./WebViewPanel.js";
34-
import { WindowService } from "./Window.js";
35-
import type { Window } from "./Window.js";
36-
import { WorkSpaceService } from "./WorkSpace.js";
37-
import type { WorkSpace } from "./WorkSpace.js";
26+
import { TreeViewService, type TreeView } from "./TreeView.js";
27+
import { WebViewPanelService, type WebViewPanel } from "./WebViewPanel.js";
28+
import { WindowService, type Window } from "./Window.js";
29+
import { WorkSpaceService, type WorkSpace } from "./WorkSpace.js";
3830

3931
// --- Internal Namespace Factory helpers ---
4032
const CreateSafeEvent = <T>(

‎Source/ApplicationConfiguration.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type {
1515
IConfigurationValue,
1616
} from "vs/platform/configuration/common/configuration.js";
1717
import type { Uri } from "vscode";
18+
1819
import { ApplicationConfigurationProblem } from "./ApplicationConfiguration/ApplicationConfigurationProblem.js";
1920
import type { IntegrationConfigurationProblem } from "./Integration/Tauri/Configuration/Problem.js";
2021
import { ParseJSON } from "./Integration/Tauri/File/ParseJSON.js";

‎Source/ApplicationConfiguration/ApplicationConfigurationProblem.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55

66
import { Data } from "effect";
7+
78
import type { IntegrationConfigurationProblem } from "../Integration/Tauri/Configuration/Problem.js";
89

910
/**

‎Source/Authentication.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import type {
1717
Disposable,
1818
Event,
1919
} from "vscode";
20+
2021
import { IPCService } from "./IPC.js";
2122
import { LoggerService } from "./Logger.js";
2223
import { CreateEventStream } from "./Utility/EventStream.js";

‎Source/Cancellation.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import { Effect, HashMap, Ref, type Scope } from "effect";
1010
import { CancellationTokenSource } from "vs/base/common/cancellation.js";
1111
import type { CancellationToken } from "vscode";
12+
1213
import { InvalidTokenIdProblem } from "./Cancellation/InvalidTokenIdProblem.js";
1314

1415
/**

‎Source/Clipboard.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import { Effect, Runtime } from "effect";
99
import type { Clipboard } from "vscode";
10-
import { ApplicationClipboardProblem } from "./Clipboard/ApplicationClipboardProblem.js";
1110

11+
import { ApplicationClipboardProblem } from "./Clipboard/ApplicationClipboardProblem.js";
1212
import type { IntegrationClipboardProblem } from "./Integration/Tauri/Clipboard/Problem.js";
1313
import { ReadText, WriteText } from "./Integration/Tauri/Clipboard/Wrapper.js";
1414

‎Source/Clipboard/ApplicationClipboardProblem.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
import { Data } from "effect";
8+
89
import type { IntegrationClipboardProblem } from "../Integration/Tauri/Clipboard/Problem.js";
910

1011
/**

‎Source/Cocoon.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
ConsoleSpanExporter,
1515
} from "@opentelemetry/sdk-trace-base";
1616
import { Deferred, Effect, Layer } from "effect";
17+
import type { IExtensionHostInitData } from "vs/workbench/services/extensions/common/extensionHostProtocol.js";
1718

1819
// --- Service Imports (PascalCase) ---
1920
import { APIDeprecationService } from "./APIDeprecation.js";
@@ -26,17 +27,17 @@ import { CommandService } from "./Command.js";
2627
import { DebugService } from "./Debug.js";
2728
import { DialogService } from "./Dialog.js";
2829
import { DocumentService } from "./Document.js";
29-
import { ESMInterceptorService } from "./ESMInterceptor.js";
3030
import { EnvironmentService } from "./Environment.js";
31+
import { ESMInterceptorService } from "./ESMInterceptor.js";
3132
import { ExtensionService } from "./Extension.js";
3233
import { ExtensionHostService } from "./ExtensionHost.js";
3334
import { ExtensionPathService } from "./ExtensionPath.js";
3435
import { FileSystemService } from "./FileSystem.js";
3536
import { FileSystemInformationService } from "./FileSystemInformation.js";
3637
import { HostKindPickerService } from "./HostKindPicker.js";
38+
import { InitDataService } from "./InitData.js";
3739
import { IPCService } from "./IPC.js";
3840
import { IPCConfigurationService } from "./IPCConfiguration.js";
39-
import { InitDataService } from "./InitData.js";
4041
import { LanguageFeatureService } from "./LanguageFeature.js";
4142
import { LoggerService } from "./Logger.js";
4243
import { MessageService } from "./Message.js";
@@ -62,8 +63,6 @@ const VSCodeOutputDirectory =
6263
Path.resolve(__dirname, "../../../Dependency/VSCode/out");
6364
(module as any).paths.unshift(VSCodeOutputDirectory);
6465

65-
import type { IExtensionHostInitData } from "vs/workbench/services/extensions/common/extensionHostProtocol.js";
66-
6766
// --- Utility Layers ---
6867
const TracingLive = NodeSdk.layer(() => ({
6968
resource: { serviceName: "cocoon" },

‎Source/Command.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type { IDisposable } from "vs/base/common/lifecycle.js";
1010
import type { IExtensionDescription } from "vs/platform/extensions/common/extensions.js";
1111
import type { MainThreadCommandsShape } from "vs/workbench/api/common/extHost.protocol.js";
1212
import type * as VSCode from "vscode";
13+
1314
import { IPCService } from "./IPC.js";
1415
import { LoggerService } from "./Logger.js";
1516
import { WindowService } from "./Window.js";

0 commit comments

Comments
 (0)