Refine status bar items' priority. (microsoft#309)

yaohaizh · web-flow · commit 16e1476d111d · 2017-05-19T12:54:19.000+08:00
diff --git a/src/arduino/boardManager.ts b/src/arduino/boardManager.ts
@@ -10,6 +10,7 @@ import * as url from "url";
 import * as vscode from "vscode";
 import * as util from "../common/util";
 
+import * as constants from "../common/constants";
 import { arduinoChannel } from "../common/outputChannel";
 import { DeviceContext } from "../deviceContext";
 import { ArduinoApp } from "./arduino";
@@ -35,11 +36,11 @@ export class BoardManager {
     private _currentBoard: IBoard;
 
     constructor(private _settings: IArduinoSettings, private _arduinoApp: ArduinoApp) {
-        this._boardStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 5);
+        this._boardStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.BOARD);
         this._boardStatusBar.command = "arduino.changeBoardType";
         this._boardStatusBar.tooltip = "Change Board Type";
 
-        this._configStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 4);
+        this._configStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.CONFIG);
         this._configStatusBar.command = "arduino.showBoardConfig";
         this._configStatusBar.text = "Config";
         this._configStatusBar.tooltip = "Config Board";
diff --git a/src/common/constants.ts b/src/common/constants.ts
@@ -29,3 +29,11 @@ export const messages = {
     SERIAL_PORT_NOT_STARTED: "Serial Monitor has not been started.",
     SEND_BEFORE_OPEN_SERIALPORT: "Please open a serial port first.",
 };
+
+export const statusBarPriority = {
+    PORT: 2,
+    OPEN_PORT: 3,
+    BAUD_RATE: 4,
+    CONFIG: 5,
+    BOARD: 6,
+};
diff --git a/src/serialmonitor/serialMonitor.ts b/src/serialmonitor/serialMonitor.ts
@@ -52,18 +52,18 @@ export class SerialMonitor implements vscode.Disposable {
     private constructor() {
         this._outputChannel = vscode.window.createOutputChannel(SerialMonitor.SERIAL_MONITOR);
         this._currentBaudRate = SerialMonitor.DEFAULT_BAUD_RATE;
-        this._portsStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 2);
+        this._portsStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.PORT);
         this._portsStatusBar.command = "arduino.selectSerialPort";
         this._portsStatusBar.tooltip = "Select Serial Port";
         this._portsStatusBar.show();
 
-        this._openPortStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 3);
+        this._openPortStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.OPEN_PORT);
         this._openPortStatusBar.command = "arduino.openSerialMonitor";
         this._openPortStatusBar.text = `$(plug)`;
         this._openPortStatusBar.tooltip = "Open Serial Monitor";
         this._openPortStatusBar.show();
 
-        this._baudRateStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 4);
+        this._baudRateStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.BAUD_RATE);
         this._baudRateStatusBar.command = "arduino.changeBaudRate";
         this._baudRateStatusBar.tooltip = "Baud Rate";
         this._baudRateStatusBar.text = SerialMonitor.DEFAULT_BAUD_RATE.toString();
