Fix close term with exit command

Author: Yang Zhen

app/backendAPI/websocketClients.js

@@ -126,7 +126,7 @@ class TtySocketClient {
   connect () {
     if (!config.isPlatform) return
     // Need to make sure EVERY ATTEMPT to connect has ensured `fsSocketConnected == true`
-    if (this.socket.connected || this.connectingPromise) return this.connectingPromise
+    if (!this.socket || this.socket.connected || this.connectingPromise) return this.connectingPromise
     let resolve, reject
     this.connectingPromise = new Promise((rsv, rjt) => { resolve = rsv; reject = rjt })
     const dispose = autorun(() => { if (config.fsSocketConnected) resolve(true) })
@@ -163,6 +163,7 @@ class TtySocketClient {
   close () {
     if (config.ttySocketConnected) {
       this.socket.disconnect('manual')
+      TtySocketClient.$$singleton = null
     }
   }
 }

app/commands/commandBindings/file.js

@@ -45,23 +45,23 @@ function createFolderAtPath (path) {
 }
 
 
-export function openFile (obj) {
+export function openFile (obj, callback) {
   if (!obj.path) return
   // 做一些encoding的调度
   if (FileState.initData.get('_init')) {
     when(() => !FileState.initData.get('_init'), () => {
       const { encoding } = FileState.initData.get(obj.path) || {}
-      openFileWithEncoding({ ...obj, encoding })
+      openFileWithEncoding({ ...obj, encoding, callback })
       FileState.initData.set(obj.path, {})
     })
   } else {
     const { encoding } = FileState.initData.get(obj.path) || {}
-    openFileWithEncoding({ ...obj, encoding })
+    openFileWithEncoding({ ...obj, encoding, callback })
     FileState.initData.set(obj.path, {})
   }
 }
 
-export function openFileWithEncoding ({ path, editor = {}, others = {}, allGroup = false, encoding }) {
+export function openFileWithEncoding ({ path, editor = {}, others = {}, allGroup = false, encoding, callback }) {
   const { encoding: currentEncoding } = FileStore.get(path) || {}
   return api.readFile(path, encoding || currentEncoding)
     .then((data) => {
@@ -79,6 +79,7 @@ export function openFileWithEncoding ({ path, editor = {}, others = {}, allGroup
           existingTab.editor.gitBlame = editor.gitBlame
         }
         existingTab.activate()
+        if (callback) callback()
       } else {
         TabStore.createTab({
           icon: icons.getClassWithColor(path.split('/').pop()) || 'fa fa-file-text-o',
@@ -88,6 +89,9 @@ export function openFileWithEncoding ({ path, editor = {}, others = {}, allGroup
           },
           ...others
         })
+        if (callback) {
+          callback()
+        }
       }
     })
 }
@@ -162,8 +166,10 @@ const fileCommands = {
   },
   'file:highlight_line': (c) => {
     console.log('file:highlight_line', c)
-    // const { path, lineNumber } = c.data
-    emitter.emit(FILE_HIGHLIGHT, c.data)
+    const { path, lineNumber } = c.data
+    openFile({ path, allGroup: true }, () => {
+      emitter.emit(FILE_HIGHLIGHT, c.data)
+    })
   },
   'file:new_file': (c) => {
     const node = c.context

app/commands/commandBindings/misc.js

@@ -40,5 +40,15 @@ export default {
     }
     SideBar.activateSidePanelView('SIDEBAR.BOTTOM.terminal')
     // $d(Tab.createTabInGroup('tab_group_terminal'))
-  }
+  },
+  'tools:terminal:open_panel': (c) => {
+    const terminalGroup = terminalState.tabGroups.get('terminalGroup')
+    if (terminalGroup) {
+      Terminal.openTerminal()
+    }
+    SideBar.activateSidePanelView('SIDEBAR.BOTTOM.terminal')
+  },
+  'tools:terminal:close_panel': (c) => {
+    SideBar.hideSidePanelView('SIDEBAR.BOTTOM.terminal')
+  },
 }

app/components/Editor/components/CodeEditor/BaseCodeEditor.jsx

@@ -51,7 +51,9 @@ class BaseCodeEditor extends Component {
       if (this.breakpointHighlight) {
         this.cm.removeLineClass(this.breakpointHighlight, 'background', 'breakpoint-highlight')
       }
-      this.breakpointHighlight = this.cm.addLineClass(lineNumber - 1, 'background', 'breakpoint-highlight')
+      if (lineNumber > 0) {
+        this.breakpointHighlight = this.cm.addLineClass(lineNumber - 1, 'background', 'breakpoint-highlight')
+      }
     }
   }
 }

app/components/Panel/SideBar/actions.js

@@ -7,7 +7,7 @@ import { SIDEBAR } from '../../Plugins/constants'
 export const SIDEBAR_ACTIVATE_VIEW = 'SIDEBAR_ACTIVATE_VIEW'
 export const SIDEBAR_TOGGLE_VIEW = 'SIDEBAR_TOGGLE_VIEW'
 export const SIDEBAR_SHOW_VIEW = 'SIDEBAR_SHOW_VIEW'
-
+export const SIDEBAR_HIDE_VIEW = 'SIDEBAR_HIDE_VIEW'
 
 const positionToPanel = {
   [SIDEBAR.RIGHT]: 'RIGHT',
@@ -30,24 +30,43 @@ const _toggleSidePanelView = (viewId, shouldShow) => {
       }
     })
     targetPanel.show()
+    emitter.emit(E.PANEL_SHOW, targetPanel)
     // 通知插件
     if (targetPlugin.actions.onSidebarActive) {
       targetPlugin.actions.onSidebarActive()
     }
   } else {
     targetPlugin.status.set('active', false)
     targetPanel.hide()
+    emitter.emit(E.PANEL_HIDE, targetPanel)
     // 通知插件
     if (targetPlugin.actions.onSidebarDeactive) {
       targetPlugin.actions.onSidebarDeactive()
     }
   }
 }
 
+const _hideSidePanelView = (viewId) => {
+  setTimeout(() => emitter.emit(E.PANEL_RESIZED), 0)
+  const targetPlugin = pluginState.plugins.get(viewId) || {}
+  const targetPanel = panelState.panels.get(`PANEL_${positionToPanel[targetPlugin.position]}`)
+  targetPlugin.status.set('active', false)
+  targetPanel.hide()
+  emitter.emit(E.PANEL_HIDE, targetPanel)
+  // 通知插件
+  if (targetPlugin.actions.onSidebarDeactive) {
+    targetPlugin.actions.onSidebarDeactive()
+  }
+}
+
 export const activateSidePanelView = registerAction(SIDEBAR_ACTIVATE_VIEW, (viewId) => {
   _toggleSidePanelView(viewId, true)
 })
 
+export const hideSidePanelView = registerAction(SIDEBAR_HIDE_VIEW, (viewId) => {
+  _hideSidePanelView(viewId)
+})
+
 export const showSidePanelView = registerAction(SIDEBAR_SHOW_VIEW, ({ viewId, shouldShow }) => {
   const plugin = pluginState.plugins.get(viewId)
   if (shouldShow) {

app/components/Terminal/Terminal.jsx

@@ -58,6 +58,7 @@ class Term extends Component {
   componentWillUnmount() {
     emitter.removeListener(E.PANEL_RESIZED, this.onResize)
     emitter.removeListener(E.THEME_CHANGED, this.onTheme)
+    TerminalState.terminalManager.remove(this.terminal)
   }
 
   render() {

app/components/Terminal/TerminalContainer.jsx

@@ -5,6 +5,7 @@ import { observer } from 'mobx-react'
 import { TabBar, TabContent, TabContentItem } from 'commons/Tab'
 import Terminal from './Terminal'
 import { Tab, TabGroup } from './state'
+import { emitter, E } from 'utils'
 
 import * as Actions from './actions'
 
@@ -33,6 +34,16 @@ class TerminalContainer extends Component {
     this.tabGroup.addTab(tab)
   }
 
+  componentDidMount () {
+    emitter.on(E.PANEL_SHOW, this.onShow)
+    emitter.on(E.PANEL_HIDE, this.onHide)
+  }
+
+  componentWillUnmount () {
+    emitter.removeListener(E.PANEL_SHOW, this.onShow)
+    emitter.removeListener(E.PANEL_HIDE, this.onHide)
+  }
+
   render () {
     return (
       <div className='tab-container'>
@@ -49,6 +60,15 @@ class TerminalContainer extends Component {
       </div>
     )
   }
+
+  onShow (panel) {
+    if (panel.id === 'PANEL_BOTTOM') {
+      Actions.openTerminal()
+    }
+  }
+
+  onHide (panel) {
+  }
 }
 
 export default TerminalContainer

app/components/Terminal/actions.js

@@ -108,3 +108,15 @@ export function inputPath (inputPath) {
 export const addTerminal = registerAction('terminal:add', () => {
   state.tabGroups.get('terminalGroup').addTab(new Tab())
 })
+
+// 如果没有，添加一个
+export const openTerminal = registerAction('terminal:open', () => {
+  const terminalTabGroup = state.tabGroups.get('terminalGroup')
+  if (terminalTabGroup.tabs.length === 0) {
+    state.tabGroups.get('terminalGroup').addTab(new Tab())
+  }
+})
+
+export const removeTerminal = registerAction('terminal:remove', (tabId) => {
+  state.tabGroups.get('terminalGroup').removeTab(tabId)
+})

app/components/Terminal/terminal-client.js

@@ -2,7 +2,9 @@ import _ from 'lodash'
 import config from 'config'
 import { autorun, observalbe, runInAction } from 'mobx'
 import { TtySocketClient } from 'backendAPI/websocketClients'
-
+import * as TabActions from 'components/Tab/actions'
+import * as TermActions from './actions'
+import * as SideBar from 'components/Panel/SideBar/actions'
 const WORKSPACE_PATH = '/home/coding/workspace'
 const BASE_PATH = '~/workspace'
 
@@ -50,7 +52,8 @@ class TerminalClient extends TtySocketClient {
       let term
       term = _.find(terms, term => term.id === data.id)
       if (term) {
-        return this.actions.removeTab(term.tabId)
+        this.remove(term)
+        return TermActions.removeTerminal(term.tabId)
       }
     })
 
@@ -125,11 +128,15 @@ class TerminalClient extends TtySocketClient {
 
   remove (removedTerm) {
     _.remove(terms, { id: removedTerm.id })
-    this.socket.emit('term.close', { id: removedTerm.id })
+    if (this.socket) {
+      this.socket.emit('term.close', { id: removedTerm.id })
+    }
     if (terms.length == 0) {
-      this.socket.disconnect()
+      // this.socket.disconnect()
+      this.close()
       if (this.unbindSocketEvent) this.unbindSocketEvent()
       this.socket = null
+      SideBar.hideSidePanelView('SIDEBAR.BOTTOM.terminal')
     }
   }
 

app/utils/emitter/index.js

@@ -3,6 +3,8 @@ import EventEmitter from 'eventemitter3'
 export default new EventEmitter()
 
 export const PANEL_RESIZED = 'PANEL_RESIZED'
+export const PANEL_SHOW = 'PANEL_SHOW'
+export const PANEL_HIDE = 'PANEL_HIDE'
 export const THEME_CHANGED = 'THEME_CHANGED'
 export const SOCKET_TRIED_FAILED = 'SOCKET_TRIED_FAILED'
 export const SOCKET_RETRY = 'SOCKET_RETRY'