Skip to content
This repository was archived by the owner on Dec 23, 2021. It is now read-only.

Commit 1774465

Browse files
committed
Merge branch 'users/t-xunguy/clue-sensors' into users/t-anmah/clue-debugger
2 parents 026244e + bedd197 commit 1774465

File tree

15 files changed

+1280
-281
lines changed

15 files changed

+1280
-281
lines changed

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import { FileSelectionService } from "./service/fileSelectionService";
2828
import { MessagingService } from "./service/messagingService";
2929
import { PopupService } from "./service/PopupService";
3030
import { SetupService } from "./service/SetupService";
31+
import { TelemetryHandlerService } from "./service/telemetryHandlerService";
3132
import { WebviewService } from "./service/webviewService";
3233
import { SimulatorDebugConfigurationProvider } from "./simulatorDebugConfigurationProvider";
3334
import getPackageInfo from "./telemetry/getPackageInfo";
3435
import TelemetryAI from "./telemetry/telemetryAI";
35-
import { TelemetryHandlerService } from "./service/telemetryHandlerService";
3636
import { UsbDetector } from "./usbDetector";
3737
import {
3838
VSCODE_MESSAGES_TO_WEBVIEW,

src/service/telemetryHandlerService.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import * as open from "open";
22
import * as vscode from "vscode";
33
import { CONSTANTS, DialogResponses, TelemetryEventName } from "../constants";
44
import * as utils from "../extension_utils/utils";
5-
import { DeviceSelectionService } from "./deviceSelectionService";
65
import TelemetryAI from "../telemetry/telemetryAI";
6+
import { DeviceSelectionService } from "./deviceSelectionService";
77

88
export class TelemetryHandlerService {
99
private telemetryAI: TelemetryAI;
@@ -244,8 +244,8 @@ export class TelemetryHandlerService {
244244
break;
245245
}
246246
return {
247-
deployTelemetryEvent: deployTelemetryEvent,
248-
deployPerformanceTelemetryEvent: deployPerformanceTelemetryEvent,
247+
deployTelemetryEvent,
248+
deployPerformanceTelemetryEvent,
249249
};
250250
};
251251

@@ -383,8 +383,8 @@ export class TelemetryHandlerService {
383383
break;
384384
}
385385
return {
386-
openSimulatorTelemetryEvent: openSimulatorTelemetryEvent,
387-
openSimulatorPerformanceTelemetryEvent: openSimulatorPerformanceTelemetryEvent,
386+
openSimulatorTelemetryEvent,
387+
openSimulatorPerformanceTelemetryEvent,
388388
};
389389
};
390390

@@ -412,8 +412,8 @@ export class TelemetryHandlerService {
412412
break;
413413
}
414414
return {
415-
newFileTelemetryEvent: newFileTelemetryEvent,
416-
newFilePerformanceTelemetryEvent: newFilePerformanceTelemetryEvent,
415+
newFileTelemetryEvent,
416+
newFilePerformanceTelemetryEvent,
417417
};
418418
};
419419
}

src/view/components/clue/Clue.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33

44
import * as React from "react";
55
import {
6+
GESTURES_CLUE,
67
SENSOR_LIST,
78
VSCODE_MESSAGES_TO_WEBVIEW,
8-
GESTURES_CLUE,
99
WEBVIEW_MESSAGES,
1010
} from "../../constants";
1111
import "../../styles/Simulator.css";
12-
import ToolBar from "../toolbar/ToolBar";
13-
import { ClueSimulator } from "./ClueSimulator";
14-
import { CLUE_TOOLBAR_ICON_ID } from "../toolbar/SensorModalUtils";
1512
import * as TOOLBAR_SVG from "../../svgs/toolbar_svg";
1613
import { sendMessage } from "../../utils/MessageUtils";
14+
import { CLUE_TOOLBAR_ICON_ID } from "../toolbar/SensorModalUtils";
15+
import ToolBar from "../toolbar/ToolBar";
16+
import { ClueSimulator } from "./ClueSimulator";
1717

1818
// Component grouping the functionality for micro:bit functionalities
1919
interface IState {

src/view/components/clue/Clue_svg.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Licensed under the MIT license.
33

44
import * as React from "react";
5+
import CONSTANTS from "../../constants";
56
import "../../styles/SimulatorSvg.css";
67
import { DEFAULT_CLUE_STATE } from "./ClueSimulator";
7-
import CONSTANTS from "../../constants";
88
export interface IRefObject {
99
[key: string]: React.RefObject<SVGRectElement>;
1010
}

0 commit comments

Comments
 (0)