Modify format of messages from vscode api to python

microsoft · Feb 10, 2020 · 86610b6 · 86610b6
1 parent 1266d12
commit 86610b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -154,7 +154,10 @@ export async function activate(context: vscode.ExtensionContext) {
                 // Handle messages from webview
                 messageListener = currentPanel.webview.onDidReceiveMessage(
                     message => {
-                        const messageJson = JSON.stringify(message.text);
+                        const messageJson = JSON.stringify({
+                            active_device: currentActiveDevice,
+                            state: message.text,
+                        });
                         switch (message.command) {
                             case WEBVIEW_MESSAGES.BUTTON_PRESS:
                                 // Send input to the Python process

diff --git a/src/view/components/cpx/CpxSimulator.tsx b/src/view/components/cpx/CpxSimulator.tsx
@@ -170,7 +170,6 @@ class Simulator extends React.Component<{}, IState> {
 
     protected togglePlayClick() {
         sendMessage("play-simulator", {
-            active_device: CONSTANTS.DEVICE_NAME.CPX,
             selected_file: this.state.selected_file,
             state: !this.state.play_button,
         });

diff --git a/src/view/components/microbit/MicrobitSimulator.tsx b/src/view/components/microbit/MicrobitSimulator.tsx
@@ -125,7 +125,6 @@ export class MicrobitSimulator extends React.Component<any, IState> {
     }
     protected togglePlayClick = () => {
         sendMessage(WEBVIEW_MESSAGES.TOGGLE_PLAY_STOP, {
-            active_device: CONSTANTS.DEVICE_NAME.MICROBIT,
             selected_file: this.state.selected_file,
             state: !this.state.play_button,
         });
@@ -154,10 +153,7 @@ export class MicrobitSimulator extends React.Component<any, IState> {
                 };
                 break;
         }
-        sendMessage(WEBVIEW_MESSAGES.BUTTON_PRESS, {
-            active_device: DEVICE_LIST_KEY.MICROBIT,
-            state: newButtonState,
-        });
+        sendMessage(WEBVIEW_MESSAGES.BUTTON_PRESS, newButtonState);
         this.setState({
             microbit: {
                 ...this.state.microbit,