Skip to content

Don't call acquireVsCodeApi more than once #14543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rchiodo merged 3 commits into from
Oct 27, 2020
Merged

Don't call acquireVsCodeApi more than once #14543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c94e9b3
Use globalThis
joyceerhl Oct 27, 2020
ecd340f
Make this.vscodeApi accessible and pass it through
joyceerhl Oct 27, 2020
b5ef26d
Merge branch 'release-2020.10' of https://github.com/microsoft/vscode…
joyceerhl Oct 27, 2020
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
7 changes: 3 additions & 4 deletions src/datascience-ui/interactive-common/redux/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ function getDebugState(vms: ICellViewModel[]): DebugState {
return firstNonDesign ? firstNonDesign.runningByLine : DebugState.Design;
}

function createMiddleWare(testMode: boolean): Redux.Middleware<{}, IStore>[] {
function createMiddleWare(testMode: boolean, postOffice: PostOffice): Redux.Middleware<{}, IStore>[] {
// Create the middleware that modifies actions to queue new actions
const queueableActions = createQueueableActionMiddleware();

Expand All @@ -304,8 +304,7 @@ function createMiddleWare(testMode: boolean): Redux.Middleware<{}, IStore>[] {
// Create the test middle ware. It sends messages that are used for testing only
// Or if testing in UI Test.
// tslint:disable-next-line: no-any
const acquireVsCodeApi = (window as any).acquireVsCodeApi as Function;
const isUITest = acquireVsCodeApi && acquireVsCodeApi().handleMessage ? true : false;
const isUITest = postOffice.vscodeApi && (postOffice.vscodeApi as any).handleMessage ? true : false;
const testMiddleware = testMode || isUITest ? createTestMiddleware() : undefined;

// Create the logger if we're not in production mode or we're forcing logging
Expand Down Expand Up @@ -423,7 +422,7 @@ export function createStore<M>(
});

// Create our middleware
const middleware = createMiddleWare(testMode).concat([addMessageDirectionMiddleware]);
const middleware = createMiddleWare(testMode, postOffice).concat([addMessageDirectionMiddleware]);

// Use this reducer and middle ware to create a store
const store = Redux.createStore(rootReducer, Redux.applyMiddleware(...middleware));
Expand Down
2 changes: 1 addition & 1 deletion src/datascience-ui/react-common/postOffice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export declare function acquireVsCodeApi(): IVsCodeApi;
export type PostOfficeMessage = { type: string; payload?: any };
// tslint:disable-next-line: no-unnecessary-class
export class PostOffice implements IDisposable {
public vscodeApi: IVsCodeApi | undefined;
private registered: boolean = false;
private vscodeApi: IVsCodeApi | undefined;
private handlers: IMessageHandler[] = [];
private baseHandler = this.handleMessages.bind(this);
private readonly subject = new Subject<PostOfficeMessage>();
Expand Down