Merge branch 'development' into 8156-openExternal

.codecov.yml

@@ -3,32 +3,5 @@ coverage:
   round: nearest
   # thresholds for red to green color coding
   range: '10...80'
-
-  status:
-    project:
-      lib-git:
-        target: auto
-        threshold: 5%
-        base: pr
-        paths: 'app/src/lib/git'
-      lib-app:
-        target: auto
-        threshold: 5%
-        base: pr
-        paths:
-          - 'app/src/lib/stores'
-          - 'app/src/lib/databases'
-      models:
-        target: auto
-        threshold: 5%
-        base: pr
-        paths: 'app/src/models'
-      ui-components:
-        target: auto
-        threshold: 5%
-        base: pr
-        paths: 'app/src/ui'
-    patch: no
-    changes: no
-
+  status: off
 comment: off

.gitignore

@@ -13,3 +13,4 @@ app/node_modules/
 *.iml
 .envrc
 junit*.xml
+*.swp

app/package.json

@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "2.1.1-beta4",
+  "version": "2.1.3",
   "main": "./main.js",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "deep-equal": "^1.0.1",
     "dexie": "^2.0.0",
     "double-ended-queue": "^2.1.0-0",
-    "dugite": "1.87.1",
+    "dugite": "1.87.2",
     "electron-window-state": "^5.0.3",
     "event-kit": "^2.0.0",
     "file-uri-to-path": "0.0.2",

app/src/lib/editors/darwin.ts

@@ -6,8 +6,9 @@ import { assertNever } from '../fatal-error'
 export enum ExternalEditor {
   Atom = 'Atom',
   MacVim = 'MacVim',
-  VisualStudioCode = 'Visual Studio Code',
-  VisualStudioCodeInsiders = 'Visual Studio Code (Insiders)',
+  VSCode = 'Visual Studio Code',
+  VSCodeInsiders = 'Visual Studio Code (Insiders)',
+  VSCodium = 'VSCodium',
   SublimeText = 'Sublime Text',
   BBEdit = 'BBEdit',
   PhpStorm = 'PhpStorm',
@@ -16,6 +17,7 @@ export enum ExternalEditor {
   Brackets = 'Brackets',
   WebStorm = 'WebStorm',
   Typora = 'Typora',
+  CodeRunner = 'CodeRunner',
   SlickEdit = 'SlickEdit',
 }
 
@@ -26,12 +28,17 @@ export function parse(label: string): ExternalEditor | null {
   if (label === ExternalEditor.MacVim) {
     return ExternalEditor.MacVim
   }
-  if (label === ExternalEditor.VisualStudioCode) {
-    return ExternalEditor.VisualStudioCode
+  if (label === ExternalEditor.VSCode) {
+    return ExternalEditor.VSCode
   }
-  if (label === ExternalEditor.VisualStudioCodeInsiders) {
-    return ExternalEditor.VisualStudioCodeInsiders
+  if (label === ExternalEditor.VSCodeInsiders) {
+    return ExternalEditor.VSCodeInsiders
   }
+
+  if (label === ExternalEditor.VSCodium) {
+    return ExternalEditor.VSCodium
+  }
+
   if (label === ExternalEditor.SublimeText) {
     return ExternalEditor.SublimeText
   }
@@ -56,6 +63,9 @@ export function parse(label: string): ExternalEditor | null {
   if (label === ExternalEditor.Typora) {
     return ExternalEditor.Typora
   }
+  if (label === ExternalEditor.CodeRunner) {
+    return ExternalEditor.CodeRunner
+  }
   if (label === ExternalEditor.SlickEdit) {
     return ExternalEditor.SlickEdit
   }
@@ -73,10 +83,12 @@ function getBundleIdentifiers(editor: ExternalEditor): ReadonlyArray<string> {
       return ['com.github.atom']
     case ExternalEditor.MacVim:
       return ['org.vim.MacVim']
-    case ExternalEditor.VisualStudioCode:
+    case ExternalEditor.VSCode:
       return ['com.microsoft.VSCode']
-    case ExternalEditor.VisualStudioCodeInsiders:
+    case ExternalEditor.VSCodeInsiders:
       return ['com.microsoft.VSCodeInsiders']
+    case ExternalEditor.VSCodium:
+      return ['com.visualstudio.code.oss']
     case ExternalEditor.SublimeText:
       return ['com.sublimetext.3']
     case ExternalEditor.BBEdit:
@@ -93,6 +105,8 @@ function getBundleIdentifiers(editor: ExternalEditor): ReadonlyArray<string> {
       return ['com.jetbrains.WebStorm']
     case ExternalEditor.Typora:
       return ['abnerworks.Typora']
+    case ExternalEditor.CodeRunner:
+      return ['com.krill.CodeRunner']
     case ExternalEditor.SlickEdit:
       return [
         'com.slickedit.SlickEditPro2018',
@@ -112,8 +126,8 @@ function getExecutableShim(
   switch (editor) {
     case ExternalEditor.Atom:
       return Path.join(installPath, 'Contents', 'Resources', 'app', 'atom.sh')
-    case ExternalEditor.VisualStudioCode:
-    case ExternalEditor.VisualStudioCodeInsiders:
+    case ExternalEditor.VSCode:
+    case ExternalEditor.VSCodeInsiders:
       return Path.join(
         installPath,
         'Contents',
@@ -122,6 +136,15 @@ function getExecutableShim(
         'bin',
         'code'
       )
+    case ExternalEditor.VSCodium:
+      return Path.join(
+        installPath,
+        'Contents',
+        'Resources',
+        'app',
+        'bin',
+        'codium'
+      )
     case ExternalEditor.MacVim:
       return Path.join(installPath, 'Contents', 'MacOS', 'MacVim')
     case ExternalEditor.SublimeText:
@@ -140,6 +163,8 @@ function getExecutableShim(
       return Path.join(installPath, 'Contents', 'MacOS', 'WebStorm')
     case ExternalEditor.Typora:
       return Path.join(installPath, 'Contents', 'MacOS', 'Typora')
+    case ExternalEditor.CodeRunner:
+      return Path.join(installPath, 'Contents', 'MacOS', 'CodeRunner')
     case ExternalEditor.SlickEdit:
       return Path.join(installPath, 'Contents', 'MacOS', 'vs')
     default:
@@ -181,6 +206,7 @@ export async function getAvailableEditors(): Promise<
     macVimPath,
     codePath,
     codeInsidersPath,
+    codiumPath,
     sublimePath,
     bbeditPath,
     phpStormPath,
@@ -189,12 +215,14 @@ export async function getAvailableEditors(): Promise<
     bracketsPath,
     webStormPath,
     typoraPath,
+    codeRunnerPath,
     slickeditPath,
   ] = await Promise.all([
     findApplication(ExternalEditor.Atom),
     findApplication(ExternalEditor.MacVim),
-    findApplication(ExternalEditor.VisualStudioCode),
-    findApplication(ExternalEditor.VisualStudioCodeInsiders),
+    findApplication(ExternalEditor.VSCode),
+    findApplication(ExternalEditor.VSCodeInsiders),
+    findApplication(ExternalEditor.VSCodium),
     findApplication(ExternalEditor.SublimeText),
     findApplication(ExternalEditor.BBEdit),
     findApplication(ExternalEditor.PhpStorm),
@@ -203,6 +231,7 @@ export async function getAvailableEditors(): Promise<
     findApplication(ExternalEditor.Brackets),
     findApplication(ExternalEditor.WebStorm),
     findApplication(ExternalEditor.Typora),
+    findApplication(ExternalEditor.CodeRunner),
     findApplication(ExternalEditor.SlickEdit),
   ])
 
@@ -215,16 +244,20 @@ export async function getAvailableEditors(): Promise<
   }
 
   if (codePath) {
-    results.push({ editor: ExternalEditor.VisualStudioCode, path: codePath })
+    results.push({ editor: ExternalEditor.VSCode, path: codePath })
   }
 
   if (codeInsidersPath) {
     results.push({
-      editor: ExternalEditor.VisualStudioCodeInsiders,
+      editor: ExternalEditor.VSCodeInsiders,
       path: codeInsidersPath,
     })
   }
 
+  if (codiumPath) {
+    results.push({ editor: ExternalEditor.VSCodium, path: codiumPath })
+  }
+
   if (sublimePath) {
     results.push({ editor: ExternalEditor.SublimeText, path: sublimePath })
   }
@@ -257,6 +290,10 @@ export async function getAvailableEditors(): Promise<
     results.push({ editor: ExternalEditor.Typora, path: typoraPath })
   }
 
+  if (codeRunnerPath) {
+    results.push({ editor: ExternalEditor.CodeRunner, path: codeRunnerPath })
+  }
+
   if (slickeditPath) {
     results.push({ editor: ExternalEditor.SlickEdit, path: slickeditPath })
   }

app/src/lib/editors/linux.ts

@@ -5,8 +5,9 @@ import { assertNever } from '../fatal-error'
 
 export enum ExternalEditor {
   Atom = 'Atom',
-  VisualStudioCode = 'Visual Studio Code',
-  VisualStudioCodeInsiders = 'Visual Studio Code (Insiders)',
+  VSCode = 'Visual Studio Code',
+  VSCodeInsiders = 'Visual Studio Code (Insiders)',
+  VSCodium = 'VSCodium',
   SublimeText = 'Sublime Text',
   Typora = 'Typora',
   SlickEdit = 'SlickEdit',
@@ -17,12 +18,16 @@ export function parse(label: string): ExternalEditor | null {
     return ExternalEditor.Atom
   }
 
-  if (label === ExternalEditor.VisualStudioCode) {
-    return ExternalEditor.VisualStudioCode
+  if (label === ExternalEditor.VSCode) {
+    return ExternalEditor.VSCode
   }
 
-  if (label === ExternalEditor.VisualStudioCodeInsiders) {
-    return ExternalEditor.VisualStudioCode
+  if (label === ExternalEditor.VSCodeInsiders) {
+    return ExternalEditor.VSCode
+  }
+
+  if (label === ExternalEditor.VSCodium) {
+    return ExternalEditor.VSCodium
   }
 
   if (label === ExternalEditor.SublimeText) {
@@ -48,10 +53,12 @@ async function getEditorPath(editor: ExternalEditor): Promise<string | null> {
   switch (editor) {
     case ExternalEditor.Atom:
       return getPathIfAvailable('/usr/bin/atom')
-    case ExternalEditor.VisualStudioCode:
+    case ExternalEditor.VSCode:
       return getPathIfAvailable('/usr/bin/code')
-    case ExternalEditor.VisualStudioCodeInsiders:
+    case ExternalEditor.VSCodeInsiders:
       return getPathIfAvailable('/usr/bin/code-insiders')
+    case ExternalEditor.VSCodium:
+      return getPathIfAvailable('/usr/bin/codium')
     case ExternalEditor.SublimeText:
       return getPathIfAvailable('/usr/bin/subl')
     case ExternalEditor.Typora:
@@ -84,13 +91,15 @@ export async function getAvailableEditors(): Promise<
     atomPath,
     codePath,
     codeInsidersPath,
+    codiumPath,
     sublimePath,
     typoraPath,
     slickeditPath,
   ] = await Promise.all([
     getEditorPath(ExternalEditor.Atom),
-    getEditorPath(ExternalEditor.VisualStudioCode),
-    getEditorPath(ExternalEditor.VisualStudioCodeInsiders),
+    getEditorPath(ExternalEditor.VSCode),
+    getEditorPath(ExternalEditor.VSCodeInsiders),
+    getEditorPath(ExternalEditor.VSCodium),
     getEditorPath(ExternalEditor.SublimeText),
     getEditorPath(ExternalEditor.Typora),
     getEditorPath(ExternalEditor.SlickEdit),
@@ -101,14 +110,15 @@ export async function getAvailableEditors(): Promise<
   }
 
   if (codePath) {
-    results.push({ editor: ExternalEditor.VisualStudioCode, path: codePath })
+    results.push({ editor: ExternalEditor.VSCode, path: codePath })
   }
 
   if (codeInsidersPath) {
-    results.push({
-      editor: ExternalEditor.VisualStudioCode,
-      path: codeInsidersPath,
-    })
+    results.push({ editor: ExternalEditor.VSCode, path: codeInsidersPath })
+  }
+
+  if (codiumPath) {
+    results.push({ editor: ExternalEditor.VSCodium, path: codiumPath })
   }
 
   if (sublimePath) {