development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 08:02:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix typos and rename things 💖

Browse source
This commit is contained in:
Sergio Padrino 2021-01-18 16:38:48 +01:00
parent 82dfe2cee0
commit eed2087cb0
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/lib/editors/darwin.ts
View file

@ -129,7 +129,7 @@ async function findApplication(
return installPath
}
log.debug(`App instalation for ${editor} not found at '${installPath}'`)
log.debug(`App installation for ${editor} not found at '${installPath}'`)
} catch (error) {
log.debug(`Unable to locate ${editor} installation`, error)
}

21
app/src/lib/editors/win32.ts
View file

@ -16,7 +16,7 @@ interface IWindowsAppInformation {
installLocation: string
}
type AppInformationExtractor = (
type AppInfoExtractor = (
keys: ReadonlyArray<RegistryValue>
) => IWindowsAppInformation
@ -39,7 +39,7 @@ interface IWindowsExternalEditor {
readonly registryKeys: ReadonlyArray<{ key: HKEY; subKey: string }>
/**
* List of path components from the editor's instalation folder to the
* List of path components from the editor's installation folder to the
* executable shim.
**/
readonly executableShimPath: ReadonlyArray<string>
@ -59,7 +59,7 @@ interface IWindowsExternalEditor {
* Optional. If not provided, those three pieces of info will be obtained from
* the 'DisplayName', 'Publisher' and 'InstallLocation' keys, respectively.
*/
readonly appInformationExtractor?: AppInformationExtractor
readonly getAppInfo?: AppInfoExtractor
/**
* Function to check if the found installation matches the expected identifier
@ -229,7 +229,7 @@ const editors: IWindowsExternalEditor[] = [
},
],
executableShimPath: ['subl.exe'],
appInformationExtractor: keys => {
getAppInfo: keys => {
let displayName = ''
let publisher = ''
let installLocation = ''
@ -413,7 +413,7 @@ const editors: IWindowsExternalEditor[] = [
},
],
executableShimPath: ['bin', 'webstorm.exe'],
appInformationExtractor: keys => {
getAppInfo: keys => {
let displayName = ''
let publisher = ''
let installLocation = ''
@ -474,7 +474,7 @@ const editors: IWindowsExternalEditor[] = [
},
],
executableShimPath: ['bin', 'phpstorm.exe'],
appInformationExtractor: keys => {
getAppInfo: keys => {
let displayName = ''
let publisher = ''
let installLocation = ''
@ -523,7 +523,7 @@ const editors: IWindowsExternalEditor[] = [
},
],
executableShimPath: [],
appInformationExtractor: keys => {
getAppInfo: keys => {
const displayName = getKeyOrEmpty(keys, 'DisplayName')
const publisher = getKeyOrEmpty(keys, 'Publisher')
const installLocation = getKeyOrEmpty(keys, 'DisplayIcon')
@ -544,7 +544,7 @@ const editors: IWindowsExternalEditor[] = [
},
],
executableShimPath: ['bin', 'rider64.exe'],
appInformationExtractor: keys => {
getAppInfo: keys => {
let displayName = ''
let publisher = ''
let installLocation = ''
@ -587,7 +587,7 @@ function getKeyOrEmpty(
return entry && entry.type === RegistryValueType.REG_SZ ? entry.data : ''
}
const defaultAppInformationExtractor: AppInformationExtractor = keys => {
const getFallbackAppInfo: AppInfoExtractor = keys => {
const displayName = getKeyOrEmpty(keys, 'DisplayName')
const publisher = getKeyOrEmpty(keys, 'Publisher')
const installLocation = getKeyOrEmpty(keys, 'InstallLocation')
@ -609,8 +609,7 @@ async function findApplication(
return null
}
const appInformationExtractor =
editor.appInformationExtractor ?? defaultAppInformationExtractor
const appInformationExtractor = editor.getAppInfo ?? getFallbackAppInfo
const { displayName, publisher, installLocation } = appInformationExtractor(
keys