Merge pull request #122 from Coding/hackape/codestyle-fix

eslint fix

Author: hackape

app/IDE/IdeEnvironment.js

@@ -1,7 +1,5 @@
 
-const IdeEnvironment = () => {
-  return {
-    editors: {}
-  }
-}
+const IdeEnvironment = () => ({
+  editors: {}
+})
 export default IdeEnvironment

app/backendAPI/fileAPI.js

@@ -1,11 +1,10 @@
-/* @flow weak */
 import { request, qs } from '../utils'
 import config from '../config'
 import axios from 'axios'
 
 export function fetchPath (path, order, group) {
   return request.get(`/workspaces/${config.spaceKey}/files`, {
-    path: path,
+    path,
     order: true,
     group: true
   })
@@ -14,10 +13,10 @@ export function fetchPath (path, order, group) {
 export function downloadFile (path, shouldPacked) {
   const packOrRaw = shouldPacked ? 'pack' : 'raw'
   let url = `${config.baseURL}/workspaces/${config.spaceKey}/${packOrRaw}`
-  url += '?' + qs.stringify({
-    path: path,
+  url += `?${qs.stringify({
+    path,
     inline: false
-  })
+  })}`
   window.open(url, '_blank')
 }
 
@@ -36,8 +35,8 @@ export function writeFile (path, content, base64) {
     method: 'PUT',
     url: `/workspaces/${config.spaceKey}/files`,
     data: {
-      path: path,
-      content: content,
+      path,
+      content,
       base64: base64 || false,
       override: true,
       createParent: true
@@ -51,7 +50,7 @@ export function readFile (path) {
   : `/workspaces/${config.spaceKey}/file/read`
 
   return request.get(url, {
-    path: path,
+    path,
     base64: false
   })
 }
@@ -61,7 +60,7 @@ export function createFile (path) {
     method: 'POST',
     url: `/workspaces/${config.spaceKey}/files`,
     data: {
-      path: path
+      path
     }
   })
 }
@@ -81,9 +80,9 @@ export function moveFile (from, to, force = false) {
     method: 'POST',
     url: `/workspaces/${config.spaceKey}/move`,
     data: {
-      from: from,
-      to: to,
-      force: force
+      from,
+      to,
+      force
     }
   })
 }
@@ -93,7 +92,7 @@ export function deleteFile (path) {
     method: 'DELETE',
     url: `/workspaces/${config.spaceKey}/files`,
     params: {
-      path: path,
+      path,
       recursive: true
     }
   })
@@ -105,7 +104,7 @@ export function searchFile (value, includeNonProjectItems = false) {
     url: `/workspaces/${config.spaceKey}/search`,
     data: {
       keyword: value,
-      includeNonProjectItems: includeNonProjectItems
+      includeNonProjectItems
     }
   })
 }

app/backendAPI/gitAPI.js

@@ -1,4 +1,3 @@
-/* @flow weak */
 import { request } from '../utils'
 import config from '../config'
 
@@ -18,16 +17,16 @@ export function gitCheckout (branch, remoteBranch) {
   })
 }
 
-export function gitCommit ({files, message}) {
-  return request.post(`/git/${config.spaceKey}/commits`, {files, message})
+export function gitCommit ({ files, message }) {
+  return request.post(`/git/${config.spaceKey}/commits`, { files, message })
 }
 
 export function gitPull () {
   return request.post(`/git/${config.spaceKey}/pull`)
 }
 
 export function gitPushAll () {
-  return request.post(`/git/${config.spaceKey}/push?all=true`).then(res => {
+  return request.post(`/git/${config.spaceKey}/push?all=true`).then((res) => {
     if (res.ok || res.nothingToPush) return true
     if (!res.ok) return false
   })
@@ -37,73 +36,73 @@ export function gitFetch () {
 }
 // branches
 export function gitNewBranch (branchName) {
-  return request.post(`/git/${config.spaceKey}/branches`, {branchName})
+  return request.post(`/git/${config.spaceKey}/branches`, { branchName })
 }
 export function gitGetBranches () {
   return request.get(`/git/${config.spaceKey}/branches`)
 }
 
-export function gitCurrentBranch (){
+export function gitCurrentBranch () {
   return request.get(`/git/${config.spaceKey}/branch`)
 }
 export function gitDeleteBranch (branchName) {
-  return request.delete(`/git/${config.spaceKey}/branches/`, {branchName})
+  return request.delete(`/git/${config.spaceKey}/branches/`, { branchName })
 }
 
-export function gitCreateStash (message){
-  return request.post(`/git/${config.spaceKey}/stash`, {message: message})
+export function gitCreateStash (message) {
+  return request.post(`/git/${config.spaceKey}/stash`, { message })
 }
 
-export function gitStashList (){
+export function gitStashList () {
   return request.get(`/git/${config.spaceKey}/stash`)
 }
 
-export function gitDropStash (stashRef, all=false){
-  return request.delete(`/git/${config.spaceKey}/stash`, {stashRef, all})
+export function gitDropStash (stashRef, all = false) {
+  return request.delete(`/git/${config.spaceKey}/stash`, { stashRef, all })
 }
 
-export function gitApplyStash ({stashRef, pop, applyIndex}){
-  return request.post(`/git/${config.spaceKey}/stash/apply`, {stashRef, pop, applyIndex})
+export function gitApplyStash ({ stashRef, pop, applyIndex }) {
+  return request.post(`/git/${config.spaceKey}/stash/apply`, { stashRef, pop, applyIndex })
 }
 
-export function gitCheckoutStash ({stashRef, branch}){
-  return request.post(`/git/${config.spaceKey}/stash/checkout`, {stashRef, branch})
+export function gitCheckoutStash ({ stashRef, branch }) {
+  return request.post(`/git/${config.spaceKey}/stash/checkout`, { stashRef, branch })
 }
 
-export function gitResetHead ({ref, resetType}) {
-  return request.post(`/git/${config.spaceKey}/reset`, {ref, resetType})
+export function gitResetHead ({ ref, resetType }) {
+  return request.post(`/git/${config.spaceKey}/reset`, { ref, resetType })
 }
 
-export function gitConflicts ({path}) {
-  return request.get(`/git/${config.spaceKey}/conflicts`, {path, base64:false})
+export function gitConflicts ({ path }) {
+  return request.get(`/git/${config.spaceKey}/conflicts`, { path, base64: false })
 }
 
-export function gitResolveConflict ({path, content}) {
-  return request.post(`/git/${config.spaceKey}/conflicts`, {path, content, base64:false})
+export function gitResolveConflict ({ path, content }) {
+  return request.post(`/git/${config.spaceKey}/conflicts`, { path, content, base64: false })
 }
 
-export function gitCancelConflict ({path}) {
-  return request.delete(`/git/${config.spaceKey}/conflicts`, {path})
+export function gitCancelConflict ({ path }) {
+  return request.delete(`/git/${config.spaceKey}/conflicts`, { path })
 }
 
-export function gitRebase ({branch, upstream, interactive, preserve}) {
-  return request.post(`/git/${config.spaceKey}/rebase`, {branch, upstream, interactive, preserve})
+export function gitRebase ({ branch, upstream, interactive, preserve }) {
+  return request.post(`/git/${config.spaceKey}/rebase`, { branch, upstream, interactive, preserve })
 }
 
-export function gitAddTag ({tagName, ref, message, force}) {
-  return request.post(`/git/${config.spaceKey}/tags`, {tagName, ref, message, force})
+export function gitAddTag ({ tagName, ref, message, force }) {
+  return request.post(`/git/${config.spaceKey}/tags`, { tagName, ref, message, force })
 }
 
 export function gitMerge (branch) {
-  return request.post(`/git/${config.spaceKey}/merge`, {name: branch})
+  return request.post(`/git/${config.spaceKey}/merge`, { name: branch })
 }
 
 export function gitRebaseState () {
   return request.get(`/git/${config.spaceKey}?state`)
 }
 
-export function gitRebaseOperate ({operation, message}) {
-  return request.post(`/git/${config.spaceKey}/rebase/operate`, {operation, message})
+export function gitRebaseOperate ({ operation, message }) {
+  return request.post(`/git/${config.spaceKey}/rebase/operate`, { operation, message })
 }
 
 export function gitRebaseUpdate (lines) {
@@ -112,15 +111,15 @@ export function gitRebaseUpdate (lines) {
   )
 }
 
-export function gitCommitDiff ({rev}) {
+export function gitCommitDiff ({ rev }) {
   return request.diffFilesList(`/git/${config.spaceKey}/commits`, { ref: rev })
 }
 
 export function gitFileDiff ({ path, oldRef, newRef }) {
   return request.diff(`/git/${config.spaceKey}/commits`, { path, oldRef, newRef })
 }
 
-export function gitReadFile ({ref, path}) {
+export function gitReadFile ({ ref, path }) {
   return request.get(`/git/${config.spaceKey}/read`, { path, ref, base64: false })
 }
 
@@ -132,17 +131,15 @@ export function gitBlame (path) {
   return request.get(`/git/${config.spaceKey}/blame`, { path })
 }
 
-export function gitLogs (params={}) {
+export function gitLogs (params = {}) {
   return request.get(`/git/${config.spaceKey}/logs`, params)
-    .then(commits => commits.map(c => {
-      return {
-        id: c.name,
-        author: c.authorIdent,
-        parentIds: c.parents,
-        message: c.shortMessage,
-        date: new Date(c.commitTime * 1000),
-      }
-    }))
+    .then(commits => commits.map(c => ({
+      id: c.name,
+      author: c.authorIdent,
+      parentIds: c.parents,
+      message: c.shortMessage,
+      date: new Date(c.commitTime * 1000),
+    })))
 }
 
 export function gitRefs () {

app/backendAPI/packageAPI.js

@@ -1,4 +1,3 @@
-/* @flow weak */
 import { request } from '../utils'
 import axios from 'axios'
 import config from '../config'
@@ -14,9 +13,8 @@ export const fetchPackageList = () => {
   }
   if (config.isPlatform) {
     return request.get(`/users/${config.globalKey}/packages`)
-  } else {
-    return request.get(`/packages`)
   }
+  return request.get('/packages')
 }
 
 export const fetchPackageInfo = (pkgName, pkgVersion) =>

app/backendAPI/websocketClients.js

@@ -78,7 +78,7 @@ class TtySocketClient {
     if (config.isPlatform) {
       const wsUrl = config.wsURL
       const firstSlashIdx = wsUrl.indexOf('/', 8)
-      let [host, path] = firstSlashIdx === -1 ? [wsUrl, ''] : [wsUrl.substring(0, firstSlashIdx), wsUrl.substring(firstSlashIdx)]
+      const [host, path] = firstSlashIdx === -1 ? [wsUrl, ''] : [wsUrl.substring(0, firstSlashIdx), wsUrl.substring(firstSlashIdx)]
       this.socket = io.connect(host, {
         forceNew: true,
         reconnection: false,
@@ -90,7 +90,7 @@ class TtySocketClient {
         transports: ['websocket']
       })
     } else {
-      this.socket = io.connect(config.baseURL, { 'resource': 'coding-ide-tty1' })
+      this.socket = io.connect(config.baseURL, { resource: 'coding-ide-tty1' })
     }
 
     this.backoff = getBackoff({
@@ -118,7 +118,7 @@ class TtySocketClient {
 
       // below is the actual working part of `connect()` method,
       // all logic above is just for ensuring `fsSocketConnected == true`
-      this.socket.io.connect(err => {
+      this.socket.io.connect((err) => {
         if (err) {
           runInAction(() => config.ttySocketConnected = false)
           return this.reconnect()

app/backendAPI/workspaceAPI.js

@@ -1,9 +1,8 @@
-/* @flow weak */
 import config from '../config'
 import { request } from '../utils'
 import { FsSocketClient } from './websocketClients'
 
-var connectedResolve
+let connectedResolve
 export const fsSocketConnectedPromise = new Promise((rs, rj) => connectedResolve = rs)
 
 export function isWorkspaceExist () {
@@ -12,7 +11,7 @@ export function isWorkspaceExist () {
 
 export function setupWorkspace () {
   return config.isPlatform ?
-    request.post('/workspaces', {spaceKey: config.spaceKey})
+    request.post('/workspaces', { spaceKey: config.spaceKey })
   : request.post(`/workspaces/${config.spaceKey}/setup`)
 }
 
@@ -21,20 +20,18 @@ export function createWorkspace (options) {
 }
 
 export function connectWebsocketClient () {
-  return new Promise(function (resolve, reject) {
+  return new Promise((resolve, reject) => {
     const fsSocketClient = new FsSocketClient()
     fsSocketClient.connect(function () {
       connectedResolve(this)
       resolve(true)
-    }, function (err) {
+    }, (err) => {
     })
   })
 }
 
 export function getSettings () {
-  return request.get(`/workspaces/${config.spaceKey}/settings`).then(({ content={} }) => {
-    return JSON.parse(content)
-  })
+  return request.get(`/workspaces/${config.spaceKey}/settings`).then(({ content = {} }) => JSON.parse(content))
 }
 
 // Switch back to old version
@@ -49,6 +46,6 @@ export function getUserProfile () {
   // @fixme: platform v1 api
   // return request.get('/user/current').then(res => res.data)
   return request.get('/user/current', null,
-    { headers: { 'Accept': '*/*' } }
+    { headers: { Accept: '*/*' } }
   ).then(res => res.data)
 }

app/commands/CommandPalette/component.jsx

@@ -1,4 +1,3 @@
-/* @flow weak */
 import React, { Component } from 'react'
 import getPaletteItems from './getPaletteItems'
 import cx from 'classnames'