Skip to content

Commit ecd38b1

Browse files
committed
resolve circle dependency
1 parent 2188687 commit ecd38b1

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { TspLanguageClient } from "./tsp-language-client";
2+
3+
export let client: TspLanguageClient | undefined;

packages/typespec-vscode/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import "./pre-extension-activate.js";
55
import vscode, { commands, ExtensionContext, TabInputText } from "vscode";
66
import { State } from "vscode-languageclient";
77
import { createCodeActionProvider } from "./code-action-provider.js";
8+
import { client } from "./extension-component.js";
89
import { ExtensionStateManager } from "./extension-state-manager.js";
910
import { ExtensionLogListener, getPopupAction } from "./log/extension-log-listener.js";
1011
import logger from "./log/logger.js";
@@ -29,7 +30,6 @@ import { importFromOpenApi3 } from "./vscode-cmd/import-from-openapi3.js";
2930
import { installCompilerGlobally } from "./vscode-cmd/install-tsp-compiler.js";
3031
import { clearOpenApi3PreviewTempFolders, showOpenApi3 } from "./vscode-cmd/openapi3-preview.js";
3132

32-
export let client: TspLanguageClient | undefined;
3333
/**
3434
* Workaround: LogOutputChannel doesn't work well with LSP RemoteConsole, so having a customized LogOutputChannel to make them work together properly
3535
* More detail can be found at https://github.com/microsoft/vscode-discussions/discussions/1149

packages/typespec-vscode/src/vscode-cmd/emit-code/emit-code.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { inspect } from "util";
55
import vscode, { QuickInputButton, Uri } from "vscode";
66
import { Document, isScalar, isSeq } from "yaml";
77
import { StartFileName, TspConfigFileName } from "../../const.js";
8-
import { client } from "../../extension.js";
8+
import { client } from "../../extension-component.js";
99
import logger from "../../log/logger.js";
1010
import { InstallAction, npmDependencyType, NpmUtil } from "../../npm-utils.js";
1111
import { getDirectoryPath } from "../../path-utils.js";

0 commit comments

Comments
 (0)