Merge remote-tracking branch 'origin/development' into feature/integration-tabby-terminal

This commit is contained in:
Le Minh Tri 2023-02-10 03:20:22 +07:00
commit f9ed154425
No known key found for this signature in database
GPG key ID: 98A15B9182F3CB59
5 changed files with 38 additions and 5 deletions

View file

@ -71,6 +71,10 @@ const editors: IDarwinExternalEditor[] = [
name: 'PyCharm Community Edition',
bundleIdentifiers: ['com.jetbrains.pycharm.ce'],
},
{
name: 'DataSpell',
bundleIdentifiers: ['com.jetbrains.DataSpell'],
},
{
name: 'RubyMine',
bundleIdentifiers: ['com.jetbrains.RubyMine'],

View file

@ -471,6 +471,14 @@ const editors: WindowsExternalEditor[] = [
displayNamePrefix: 'Fleet ',
publishers: ['JetBrains s.r.o.'],
},
{
name: 'JetBrains DataSpell',
registryKeys: registryKeysForJetBrainsIDE('DataSpell'),
executableShimPaths: executableShimPathsForJetBrainsIDE('dataspell'),
jetBrainsToolboxScriptName: 'dataspell',
displayNamePrefix: 'DataSpell ',
publishers: ['JetBrains s.r.o.'],
},
]
function getKeyOrEmpty(

View file

@ -1,5 +1,3 @@
/* eslint-disable jsx-a11y/no-static-element-interactions */
/* eslint-disable jsx-a11y/click-events-have-key-events */
import React from 'react'
import { Select } from '../lib/select'
import { Button } from '../lib/button'
@ -73,10 +71,10 @@ export class CommitMessageAvatar extends React.Component<
public render() {
return (
<div className="commit-message-avatar-component">
<div onClick={this.onAvatarClick}>
<Button className="avatar-button" onClick={this.onAvatarClick}>
{this.props.warningBadgeVisible && this.renderWarningBadge()}
<Avatar user={this.props.user} title={this.props.title} />
</div>
</Button>
{this.state.isPopoverOpen && this.renderPopover()}
</div>
)
@ -108,7 +106,7 @@ export class CommitMessageAvatar extends React.Component<
})
}
private onAvatarClick = (event: React.FormEvent<HTMLDivElement>) => {
private onAvatarClick = (event: React.FormEvent<HTMLButtonElement>) => {
if (this.props.warningBadgeVisible === false) {
return
}

View file

@ -2,6 +2,27 @@
// With this, the popover's absolute position will be relative to its parent
position: relative;
.avatar-button {
// override default button styles
overflow: inherit;
text-overflow: inherit;
white-space: inherit;
font-family: inherit;
font-size: inherit;
padding: inherit;
border: none;
height: inherit;
color: inherit;
background-color: none;
border-radius: 50%;
margin-right: var(--spacing-half);
.avatar {
margin-right: 0;
}
}
.warning-badge {
background-color: var(--commit-warning-badge-background-color);
border: var(--commit-warning-badge-border-color) 1px solid;

View file

@ -45,6 +45,7 @@ These editors are currently supported:
- [RStudio](https://rstudio.com/)
- [Aptana Studio](http://www.aptana.com/)
- [JetBrains Fleet](https://www.jetbrains.com/fleet/)
- [JetBrains DataSpell](https://www.jetbrains.com/dataspell/)
These are defined in a list at the top of the file:
@ -272,6 +273,7 @@ These editors are currently supported:
- [Emacs](https://www.gnu.org/software/emacs/)
- [Lite XL](https://lite-xl.com/)
- [JetBrains Fleet](https://www.jetbrains.com/fleet/)
- [JetBrains DataSpell](https://www.jetbrains.com/dataspell/)
These are defined in a list at the top of the file: