mirror of
https://github.com/ckaczor/vscode-gitlens.git
synced 2026-02-12 11:08:34 -05:00
Compare commits
14 Commits
v5.1.1-bet
...
v4.0.0-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
068b34b781 | ||
|
|
5328e56230 | ||
|
|
0fb718804e | ||
|
|
516bcf7eef | ||
|
|
f9bbc9af0a | ||
|
|
9cc96d4041 | ||
|
|
41785f6872 | ||
|
|
f72ea0005c | ||
|
|
b3f0d19e48 | ||
|
|
60702ff314 | ||
|
|
b72d22032c | ||
|
|
6b9fc3f9d2 | ||
|
|
5af70fd2bf | ||
|
|
cecd3524b8 |
8
.vscode/settings.json
vendored
8
.vscode/settings.json
vendored
@@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"editor.insertSpaces": true,
|
"editor.insertSpaces": true,
|
||||||
"files.exclude": {
|
"files.exclude": {
|
||||||
"**/node_modules": true,
|
"node_modules": true,
|
||||||
"**/out": true
|
"out": true
|
||||||
},
|
},
|
||||||
"files.trimTrailingWhitespace": true,
|
"files.trimTrailingWhitespace": true,
|
||||||
"search.exclude": {
|
"search.exclude": {
|
||||||
"**/node_modules": true,
|
"node_modules": true,
|
||||||
"**/out": true
|
"out": true
|
||||||
},
|
},
|
||||||
"javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
|
"javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false,
|
||||||
"typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version
|
"typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version
|
||||||
|
|||||||
25
.vscode/tasks.json
vendored
25
.vscode/tasks.json
vendored
@@ -9,18 +9,13 @@
|
|||||||
// A task runner that calls a custom npm script that compiles the extension.
|
// A task runner that calls a custom npm script that compiles the extension.
|
||||||
{
|
{
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"presentation": {
|
"showOutput": "silent",
|
||||||
"echo": true,
|
|
||||||
"reveal": "always",
|
|
||||||
"focus": false,
|
|
||||||
"panel": "shared"
|
|
||||||
},
|
|
||||||
"tasks": [
|
"tasks": [
|
||||||
{
|
{
|
||||||
"label": "compile",
|
"taskName": "compile",
|
||||||
"type": "npm",
|
"command": "npm run compile --silent",
|
||||||
"script": "compile",
|
"isBuildCommand": true,
|
||||||
"group": "build",
|
"isShellCommand": true,
|
||||||
"problemMatcher": [
|
"problemMatcher": [
|
||||||
"$tsc",
|
"$tsc",
|
||||||
{
|
{
|
||||||
@@ -30,17 +25,19 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "npm",
|
"taskName": "lint",
|
||||||
"script": "lint",
|
"command": "npm run lint --silent",
|
||||||
|
"isShellCommand": true,
|
||||||
"problemMatcher": {
|
"problemMatcher": {
|
||||||
"base": "$tslint5",
|
"base": "$tslint5",
|
||||||
"fileLocation": "relative"
|
"fileLocation": "relative"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "npm",
|
"taskName": "watch",
|
||||||
"script": "watch",
|
"command": "npm run watch --silent",
|
||||||
"isBackground": true,
|
"isBackground": true,
|
||||||
|
"isShellCommand": true,
|
||||||
"problemMatcher": "$tsc-watch"
|
"problemMatcher": "$tsc-watch"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
!images/dark/**
|
!images/*.svg
|
||||||
!images/light/**
|
|
||||||
!images/gitlens-icon.png
|
|
||||||
images/**
|
images/**
|
||||||
.vscode/**
|
.vscode/**
|
||||||
.vscode-test/**
|
.vscode-test/**
|
||||||
|
|||||||
298
CHANGELOG.md
298
CHANGELOG.md
@@ -4,278 +4,16 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
|
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
|
|
||||||
## [Unreleased]
|
## [4.0.0-beta] - 2017-06-06
|
||||||
|
|
||||||
## [5.1.1-beta]
|
|
||||||
### Added
|
|
||||||
- Adds new `Changed Files` node to the `Repository Status` node of the `GitLens` custom view's `Repository View` (enabled via `"gitlens.insiders": true`) -- closes [#139](https://github.com/eamodio/vscode-gitlens/issues/139)
|
|
||||||
- Provides a file-based view of all the changed files in the working tree and/or files in commits that haven't yet been pushed upstream
|
|
||||||
- Adds `gitlens.gitExplorer.enabled` setting to specify whether or not to show the `GitLens` custom view - closes [#144](https://github.com/eamodio/vscode-gitlens/issues/144)
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Chnages the default of the `gitlens.gitExplorer.commitFormat` setting to add parentheses around the commit id
|
|
||||||
- Removes many menu items from `editor/title` & `editor/title/context` by default -- can be re-enabled via the `gitlens.advanced.menus` setting
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- Fixes an issue when running `Open File in Remote` with a multi-line selection wasn't properly opening the selection in GitLab -- thanks to [PR #145](https://github.com/eamodio/vscode-gitlens/pull/145) by Amanda Cameron ([@AmandaCameron](https://github.com/AmandaCameron))!
|
|
||||||
- Fixes an issue where the `gitlens.advanced.menus` setting wasn't controlling all the menu items properly
|
|
||||||
|
|
||||||
## [5.1.0] - 2017-09-15
|
|
||||||
### Added
|
|
||||||
- Adds full (multi-line) commit message to the `details` hover annotations -- closes [#116](https://github.com/eamodio/vscode-gitlens/issues/116)
|
|
||||||
- Adds an external link icon to the `details` hover annotations to run the `Open Commit in Remote` command (`gitlens.openCommitInRemote`)
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Optimizes performance of the providing blame annotations, especially for large files (saw a ~78% improvement on some files)
|
|
||||||
- Optimizes date handling (parsing and formatting) for better performance and reduced memory consumption
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
- Removes `gitlens.annotations.file.recentChanges.hover.wholeLine` setting as it didn't really make sense
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- Fixes an issue where stashes with only untracked files would not show in the `Stashes` node of the GitLens custom view
|
|
||||||
- Fixes an issue where stashes with untracked files would not show its untracked files in the GitLens custom view
|
|
||||||
|
|
||||||
## [5.0.0] - 2017-09-12
|
|
||||||
### Added
|
|
||||||
- Adds an all-new `GitLens` custom view to the Explorer activity
|
|
||||||
|
|
||||||
- `Repository View` - provides a full repository explorer
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- `Repository Status` node — provides the status of the repository
|
|
||||||
- Provides the name of the current branch, its upstream tracking branch (if available), and its upstream status (if available)
|
|
||||||
- Provides indicator dots on the repository icon which denote the following:
|
|
||||||
- `None` - up-to-date with the upstream
|
|
||||||
- `Green` - ahead of the upstream
|
|
||||||
- `Red` - behind the upstream
|
|
||||||
- `Yellow` - both ahead of and behind the upstream
|
|
||||||
- Provides additional nodes, if the current branch is not synchronized with the upstream, to quickly see and explore the specific commits ahead and/or behind the upstream
|
|
||||||
- Provides a context menu with `Open Repository in Remote`, and `Refresh` commands
|
|
||||||
|
|
||||||
- `Branches` node — provides a list of the local branches
|
|
||||||
- Indicates which branch is the current branch and optionally shows the remote tracking branch
|
|
||||||
- Expand each branch to easily see its revision (commit) history
|
|
||||||
- Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
|
|
||||||
- Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, `Show File History`, and `Show Commit File Details` commands
|
|
||||||
- Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Open All Changes`, `Open All Changes with Working Tree`, `Open Files`, `Open Revisions`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Show Commit Details`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each branch with `Open Branch in Remote`, and `Refresh` commands
|
|
||||||
- Provides a context menu with `Open Branches in Remote`, and `Refresh` commands
|
|
||||||
|
|
||||||
- `Remotes` node — provides a list of remotes
|
|
||||||
- Indicates the direction of the remote (fetch, push, both), remote service (if applicable), and repository path
|
|
||||||
- Expand each remote to see its list of branches
|
|
||||||
- Expand each branch to easily see its revision (commit) history
|
|
||||||
- Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
|
|
||||||
- Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
|
|
||||||
- Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Open All Changes`, `Open All Changes with Working Tree`, `Open Files`, `Open Revisions`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`,`Show Commit Details`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each remote with `Open Branches in Remote`, `Open Repository in Remote`, and `Refresh` commands
|
|
||||||
- Provides a context menu with a `Refresh` command
|
|
||||||
|
|
||||||
- `Stashes` node — provides a list of stashed changes
|
|
||||||
- Expand each stash to quickly see the set of files stashed, complete with status indicators for adds, changes, renames, and deletes
|
|
||||||
- Provides a context menu with `Stash Changes`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each stash with `Apply Stashed Changes` (confirmation required), `Delete Stashed Changes` (confirmation required), `Open All Changes`, `Open All Changes with Working Tree`, `Open Files`, `Open Revisions`, `Copy Commit Message to Clipboard`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each stashed file with `Apply Changes`, `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, and `Show File History` commands
|
|
||||||
|
|
||||||
- `History View` - provides the revision history of the active file
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Automatically updates to track the active editor
|
|
||||||
- Provides a context menu with `Open File`, `Open File in Remote`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each revision (commit) with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
|
|
||||||
|
|
||||||
- Quickly switch between views using the `Switch to Repository View` or `Switch to History View` commands
|
|
||||||
- Provides toolbar commands to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh`
|
|
||||||
|
|
||||||
- Adds all-new interactivity to the hover annotations
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Adds the following command-links to the `details` hover annotation
|
|
||||||
- Clicking the commit id will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
|
|
||||||
- Adds the following command-links to the `changes` hover annotation
|
|
||||||
- Clicking on `Changes` will run the `Compare File Revisions` command (`gitlens.diffWith`)
|
|
||||||
- Clicking the current and previous commit ids will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
|
|
||||||
|
|
||||||
- Adds support for remote services with custom domains -- closes [#120](https://github.com/eamodio/vscode-gitlens/issues/120)
|
|
||||||
- Adds support for the Bitbucket Server (previously called Stash) remote service -- closes [#120](https://github.com/eamodio/vscode-gitlens/issues/120)
|
|
||||||
- Adds `gitlens.blame.ignoreWhitespace` setting to specify whether or not to ignore whitespace when comparing revisions during blame operations -- closes [#138](https://github.com/eamodio/vscode-gitlens/issues/138)
|
|
||||||
- Adds `Compare File Revisions` command (`gitlens.diffWith`) - compares the specified file revisions
|
|
||||||
- Adds `Open Branches in Remote` command (`gitlens.openBranchesInRemote`) - opens the branches in the supported remote service
|
|
||||||
- Adds `Stash Changes` command (`gitlens.stashSave`) to the source control group context menu -- can now stash a group of files
|
|
||||||
- Adds `Stash Changes` command (`gitlens.stashSave`) to the source control resource context menu -- can now stash individual files (works with multi-select too!)
|
|
||||||
- Adds `gitlens.gitExplorer.view` setting to specify the starting view (mode) of the `GitLens` custom view
|
|
||||||
- Adds `gitlens.gitExplorer.showTrackingBranch` setting to specify whether or not to show the tracking branch when displaying local branches in the `GitLens` custom view
|
|
||||||
- Adds `gitlens.gitExplorer.commitFormat` setting to specify the format of committed changes in the `GitLens` custom view
|
|
||||||
- Adds `gitlens.gitExplorer.commitFileFormat` setting to specify the format of a committed file in the `GitLens` custom view
|
|
||||||
- Adds `gitlens.gitExplorer.stashFormat` setting to specify the format of stashed changes in the `GitLens` custom view
|
|
||||||
- Adds `gitlens.gitExplorer.stashFileFormat` setting to specify the format of a stashed file in the `GitLens` custom view
|
|
||||||
- Adds `${filePath}` token to file formatting settings
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Changes `Show Stashed Changes` option icon in repository status quick pick menu to match the `GitLens` custom view
|
|
||||||
- Changes `Stash Changes` option icon in stashed changes quick pick menu to a plus (+)
|
|
||||||
- Renames `Compare File with Previous` command (`gitlens.diffWithPrevious`) to `Compare File with Previous Revision`
|
|
||||||
- Renames `Compare File with Next Commit` command (`gitlens.diffWithNext`) to `Compare File with Next Revision`
|
|
||||||
- Renames `Compare File with Working Tree` command (`gitlens.diffWithWorking`) to `Compare File with Working Revision`
|
|
||||||
- Renames `Compare Line Commit with Previous` command (`gitlens.diffLineWithPrevious`) to `Compare Line Revision with Previous`
|
|
||||||
- Renames `Compare Line Commit with Working Tree` command (`gitlens.diffLineWithWorking`) to `Compare Line Revision with Working`
|
|
||||||
|
|
||||||
### Removed
|
|
||||||
- Removes `Git Stashes` custom view view - as it's functionality has been folded into the new `GitLens` custom view
|
|
||||||
- Removes `gitlens.stashExplorer.stashFormat` setting
|
|
||||||
- Removes `gitlens.stashExplorer.stashFileFormat` setting
|
|
||||||
- Removes `Stash Unstaged Changes` option from stashed changes quick pick menu -- didn't work as intended
|
|
||||||
- Removes the seeding of the commit search command from the clipboard
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- Fixes an issue where double hover annotations could be shown on blank lines
|
|
||||||
- Fixes an issue where remote branches couldn't be opened properly in their remote service
|
|
||||||
- Fixes [#130](https://github.com/eamodio/vscode-gitlens/issues/130) - First-run "Thank you for choosing GitLens! [...]" info message shown on every start up
|
|
||||||
- Fixes an issue where sometimes diffs (via branch name) wouldn't open properly
|
|
||||||
- Fixes an issue where remotes are queried more than once on startup
|
|
||||||
|
|
||||||
## [4.4.3] - 2017-08-30
|
|
||||||
## Fixed
|
|
||||||
- Fixes [#135](https://github.com/eamodio/vscode-gitlens/issues/135) - Full-width characters break gutter annotations (really this time)
|
|
||||||
|
|
||||||
## [4.4.2] - 2017-08-29
|
|
||||||
## Fixed
|
|
||||||
- Fixes [#135](https://github.com/eamodio/vscode-gitlens/issues/135) - Full-width characters break gutter annotations
|
|
||||||
|
|
||||||
## [4.4.1] - 2017-08-23
|
|
||||||
## Fixed
|
|
||||||
- Fixes [#114](https://github.com/eamodio/vscode-gitlens/issues/114) - Stylus files makes code lens freak out
|
|
||||||
|
|
||||||
## [4.4.0] - 2017-08-18
|
|
||||||
## Added
|
|
||||||
- Adds a progress indicator to the `Toggle File Blame Annotations` command (`gitlens.toggleFileBlame`) icon -- pulses while annotations are computed
|
|
||||||
- Adds an active state to the `Toggle File Blame Annotations` command (`gitlens.toggleFileBlame`) icon -- turns orange while the annotations are visible
|
|
||||||
- Adds automatic disabling of the current line blame annotations when starting a debug session and will restore them when the debug session ends -- can still be manually toggled via the `Toggle Line Blame Annotations` command (`gitlens.toggleLineBlame`)
|
|
||||||
|
|
||||||
## Changed
|
|
||||||
- Changes chat links from Gitter to [Slack](https://join.slack.com/t/vscode-gitlens/shared_invite/MjIxOTgxNDE3NzM0LTE1MDE2Nzk1MTgtMjkwMmZjMzcxNQ)
|
|
||||||
- Changes the look of the line separators on the gutter blame annotations
|
|
||||||
- Changes the `gitlens.advanced.toggleWhitespace.enabled` configuration setting to default to `false` -- thanks to the awesome work in vscode by Alexandru Dima ([@alexandrudima](https://github.com/alexandrudima)) this is no longer required!
|
|
||||||
|
|
||||||
## Removed
|
|
||||||
- Removes unneeded `gitlens.stashExplorer.enabled` configuration setting since users can add or remove custom views natively now
|
|
||||||
- Removes unneeded `Toggle Git Stashes Explorer` command (`gitlens.stashExplorer.toggle`) since users can add or remove custom views natively now
|
|
||||||
- Removes the `gitlens.theme.annotations.file.hover.separateLines` configuration setting
|
|
||||||
|
|
||||||
## Fixed
|
|
||||||
- Fixes jumpiness when opening a diff to a certain line
|
|
||||||
|
|
||||||
## [4.3.3] - 2017-07-28
|
|
||||||
## Added
|
|
||||||
- Adds progress indicator for when computing annotations takes a while
|
|
||||||
|
|
||||||
## Changed
|
|
||||||
- Optimizes performance of the providing blame annotations, especially for large files (saw a 3.5x improvement on some files)
|
|
||||||
|
|
||||||
## Fixed
|
|
||||||
- Fixes [#107](https://github.com/eamodio/vscode-gitlens/issues/107) - Double-byte characters break blame layout (still requires proper font support)
|
|
||||||
|
|
||||||
## [4.3.2] - 2017-07-20
|
|
||||||
## Fixed
|
|
||||||
- Fixes [#118](https://github.com/eamodio/vscode-gitlens/issues/118) - GitLens stopped working on latest insiders build -- thanks to [PR #121](https://github.com/eamodio/vscode-gitlens/pull/121) by Johannes Rieken ([@jrieken](https://github.com/jrieken))
|
|
||||||
|
|
||||||
## [4.3.1] - 2017-07-03
|
|
||||||
## Added
|
|
||||||
- Adds `gitlens.stashExplorer.enabled` setting to specify whether or not to show the `Git Stashes` custom view
|
|
||||||
- Adds `Toggle Git Stashes Explorer` command (`gitlens.stashExplorer.toggle`) - toggles the `Git Stashes` custom view on and off
|
|
||||||
|
|
||||||
## Changed
|
|
||||||
- Hides the `Git Stashes` custom view by default
|
|
||||||
|
|
||||||
## Fixed
|
|
||||||
- Fixes [#108](https://github.com/eamodio/vscode-gitlens/issues/108) - Option to remove stash explorer from the main explorer?
|
|
||||||
|
|
||||||
## [4.3.0] - 2017-07-03
|
|
||||||
## Added
|
|
||||||
- Adds `Git Stashes` custom view to the Explorer activity
|
|
||||||
- Shows all of the stashed changes in the repository
|
|
||||||
- Provides toolbar buttons to `Stash Changes` and `Refresh`
|
|
||||||
- Provides a context menu with `Apply Stashed Changes` and `Delete Stashed Changes` commands - both require a confirmation
|
|
||||||
- Expand each stash to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
|
|
||||||
- Provides a context menu with `Open Changes`, `Open File`, `Open Stashed File`, `Open File in Remote`, and `Compare File with Working Tree` commands
|
|
||||||
|
|
||||||
## [4.2.0] - 2017-06-27
|
|
||||||
## Added
|
|
||||||
- Adds `Compare File with Revision...` command (`gitlens.diffWithRevision`) - compares the active file with the selected revision of the same file
|
|
||||||
- Adds `Open Changed Files` command (`gitlens.openChangedFiles`) to the source control group context menu
|
|
||||||
- Adds `Close Unchanged Files` command (`gitlens.closeUnchangedFiles`) to the source control group context menu
|
|
||||||
- Adds `Open File in Remote` command (`gitlens.openFileInRemote`) to the source control resource context menu
|
|
||||||
- Adds `Compare File with Revision...` command (`gitlens.diffWithRevision`) to the source control resource context menu
|
|
||||||
- Adds `Show File History` command (`gitlens.showQuickFileHistory`) to the source control resource context menu
|
|
||||||
|
|
||||||
## Changed
|
|
||||||
- Renames `Compare File with...` command to `Compare File with Branch...`
|
|
||||||
- Renames `Open Line Commit in Remote` command to `Open Commit in Remote`
|
|
||||||
- Renames `Show Line Commit Details` command to `Show Commit File Details`
|
|
||||||
- Updates the description of `gitlens.blame.line.enabled` to be clearer about its behavior
|
|
||||||
- Updates the description of `gitlens.codeLens.enabled` to be clearer about its behavior
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- Fixes [#103](https://github.com/eamodio/vscode-gitlens/issues/103) - Toggle file blame annotations disables line blame annotations if line blame annotations are off by default
|
|
||||||
- Fixes another infinite loop in the `Close Unchanged Files` command
|
|
||||||
|
|
||||||
## [4.1.4] - 2017-06-25
|
|
||||||
## Changed
|
|
||||||
- Optimizes performance of the `Compare with Previous` commands - also avoids trying to focus a line if we don't have one
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- Fixes `changes` (diff) hover not showing the correct previous line (for real this time)
|
|
||||||
- Attempts to fix [#99](https://github.com/eamodio/vscode-gitlens/issues/99) - undo/redo spawns too many git processes
|
|
||||||
|
|
||||||
## [4.1.3] - 2017-06-20
|
|
||||||
### Fixed
|
|
||||||
- Fixes `changes` (diff) hover not showing the correct previous line when showing recent changes annotations of the whole-file
|
|
||||||
|
|
||||||
## [4.1.2] - 2017-06-15
|
|
||||||
### Fixed
|
|
||||||
- Fixes [#96](https://github.com/eamodio/vscode-gitlens/issues/96) - External diff command can be unintentionally triggered
|
|
||||||
|
|
||||||
## [4.1.1] - 2017-06-13
|
|
||||||
### Added
|
|
||||||
- Adds an `alt` command to the `Toggle File Blame Annotations` command button, which when you hold down `alt` and click it will execute the `Toggle Recent File Changes Annotations` command instead
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- Fixes missing `Toggle File Blame Annotations` command icon
|
|
||||||
|
|
||||||
## [4.1.0] - 2017-06-13
|
|
||||||
### Added
|
|
||||||
- Adds all-new recent changes annotations of the whole-file - annotates and highlights all of lines changed in the most recent commit
|
|
||||||
- Can customize the [layout](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#file-recent-changes-annotation-settings), as well as the [theme](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#theme-settings)
|
|
||||||
- Adds `Toggle Recent File Changes Annotations` command (`gitlens.toggleFileRecentChanges`) - toggles the recent changes annotations on and off
|
|
||||||
- Adds ability to press `Escape` to quickly toggle any whole-file annotations off
|
|
||||||
- Improves performance
|
|
||||||
- Optimized git output parsing to increase speed and dramatically reduce memory usage
|
|
||||||
- Defers diff chunk parsing until it is actually required
|
|
||||||
- Adds `gitlens.defaultDateFormat` setting to specify how all absolute dates will be formatted by default
|
|
||||||
|
|
||||||
### Fixed
|
|
||||||
- Fixes excessive memory usage when parsing diffs
|
|
||||||
- Fixes extra newline in multi-line commit messages
|
|
||||||
- Fixes (again) [#33](https://github.com/eamodio/vscode-gitlens/issues/33) - Commit messages can causes markdown formatting in hovers
|
|
||||||
|
|
||||||
## [4.0.1] - 2017-06-09
|
|
||||||
### Fixed
|
|
||||||
- Fixes [#87](https://github.com/eamodio/vscode-gitlens/issues/87) - Can't open files in remote when using git@ urls (ssh)
|
|
||||||
|
|
||||||
## [4.0.0] - 2017-06-09
|
|
||||||
### Added
|
### Added
|
||||||
- Adds all-new, beautiful, highly customizable and themeable, file blame annotations
|
- Adds all-new, beautiful, highly customizable and themeable, file blame annotations
|
||||||
- Can now fully customize the [layout and content](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#file-blame-annotation-settings), as well as the [theme](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#theme-settings)
|
- Can now fully customize the [layout and content](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#file-blame-annotation-settings), as well as the [theme](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#theme-settings)
|
||||||
- Adds all-new configurability and themeability to the current line blame annotations
|
- Adds all-new configurability and themeability to the current line blame annotations
|
||||||
- Can now fully customize the [layout and content](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#line-blame-annotation-settings), as well as the [theme](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#theme-settings)
|
- Can now fully customize the [layout and content](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#line-blame-annotation-settings), as well as the [theme](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#theme-settings)
|
||||||
- Adds all-new configurability to the status bar blame information
|
- Adds all-new configurability to the status bar blame information
|
||||||
- Can now fully customize the [layout and content](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#status-bar-settings)
|
- Can now fully customize the [layout and content](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#status-bar-settings)
|
||||||
- Adds all-new [configurability](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#advanced-settings) over which commands are added to which menus via the `gitlens.advanced.menus` setting
|
- Adds all-new [configurability](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#advanced-settings) over which commands are added to which menus via the `gitlens.advanced.menus` setting
|
||||||
- Adds better [configurability](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#code-lens-settings) over where Git code lens will be shown -- both by default and per language
|
- Adds better [configurability](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#code-lens-settings) over where Git code lens will be shown -- both by default and per language
|
||||||
- Adds an all-new `changes` (diff) hover annotation to the current line - provides instant access to the line's previous version
|
- Adds an all-new `changes` (diff) hover annotation to the current line - provides instant access to the line's previous version
|
||||||
- Adds `Toggle Line Blame Annotations` command (`gitlens.toggleLineBlame`) - toggles the current line blame annotations on and off
|
- Adds `Toggle Line Blame Annotations` command (`gitlens.toggleLineBlame`) - toggles the current line blame annotations on and off
|
||||||
- Adds `Show Line Blame Annotations` command (`gitlens.showLineBlame`) - shows the current line blame annotations
|
- Adds `Show Line Blame Annotations` command (`gitlens.showLineBlame`) - shows the current line blame annotations
|
||||||
@@ -283,17 +21,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
|
|||||||
- Adds `Show File Blame Annotations` command (`gitlens.showFileBlame`) - shows the file blame annotations
|
- Adds `Show File Blame Annotations` command (`gitlens.showFileBlame`) - shows the file blame annotations
|
||||||
- Adds `Open File in Remote` command (`gitlens.openFileInRemote`) to the `editor/title` context menu
|
- Adds `Open File in Remote` command (`gitlens.openFileInRemote`) to the `editor/title` context menu
|
||||||
- Adds `Open Repo in Remote` command (`gitlens.openRepoInRemote`) to the `editor/title` context menu
|
- Adds `Open Repo in Remote` command (`gitlens.openRepoInRemote`) to the `editor/title` context menu
|
||||||
- Adds `gitlens.strings.*` settings to allow for the customization of certain strings displayed
|
|
||||||
- Adds `gitlens.theme.*` settings to allow for the theming of certain elements
|
|
||||||
- Adds `gitlens.advanced.telemetry.enabled` settings to explicitly opt-in or out of telemetry, but still ultimately honors the `telemetry.enableTelemetry` setting
|
|
||||||
- Adds ability to suppress most warning messages - which can be re-enabled using the `Reset Suppressed Warnings` command (`gitlens.resetSuppressedWarnings`)
|
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
- (BREAKING) Almost all of the GitLens settings have either been renamed, removed, or otherwise changed - see the [README](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens#extension-settings)`
|
- (BREAKING) Almost all of the GitLens settings have either been renamed, removed, or otherwise changed - see the [README](https://github.com/eamodio/vscode-gitlens/blob/develop/README.md#extension-settings)`
|
||||||
- Changes the positioning of the Git code lens to try to be at the end of any other code lens on the same line
|
- Changes the positioning of the Git code lens to try to be at the end of any other code lens on the same line
|
||||||
- Changes the position of the `Open File in Remote` command (`gitlens.openFileInRemote`) in the context menus - now in the `navigation` group
|
- Changes the position of the `Open File in Remote` command (`gitlens.openFileInRemote`) in the context menus - now in the `navigation` group
|
||||||
- Changes the `Toggle Git Code Lens` command (`gitlens.toggleCodeLens`) to always toggle the Git code lens on and off
|
- Changes the `Toggle Git Code Lens` command (`gitlens.toggleCodeLens`) to always toggle the Git code lens on and off
|
||||||
- Changes the default of `gitlens.advanced.toggleWhitespace.enabled` back to `true`, but automatically disables whitespace toggling if whitespace rendering is not on
|
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
- Removes the on-demand `trailing` file blame annotations -- didn't work out and just ended up with a ton of visual noise
|
- Removes the on-demand `trailing` file blame annotations -- didn't work out and just ended up with a ton of visual noise
|
||||||
@@ -302,13 +35,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- Fixes [#81](https://github.com/eamodio/vscode-gitlens/issues/81) - Current line annotation feels too sticky
|
- Fixes [#81](https://github.com/eamodio/vscode-gitlens/issues/81) - Current line annotation feels too sticky
|
||||||
- Fixes [#83](https://github.com/eamodio/vscode-gitlens/issues/83) - Calling "close unchanged files" results in no new files being openable
|
|
||||||
- Fixes issues with the zone.js monkey patching done by application insights (telemetry) - disables all the monkey patching
|
|
||||||
- Fixes issue with `Open Branch in Remote` & `Open Repository in Remote` not showing when there are no open editors
|
|
||||||
|
|
||||||
## [3.6.1] - 2017-06-07
|
|
||||||
### Fixed
|
|
||||||
- Fixes issues with the zone.js monkey patching done by application insights (telemetry) - disables all the monkey patching
|
|
||||||
|
|
||||||
## [3.6.0] - 2017-06-02
|
## [3.6.0] - 2017-06-02
|
||||||
### Added
|
### Added
|
||||||
@@ -343,7 +69,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
|
|||||||
### Added
|
### Added
|
||||||
- Improves performance
|
- Improves performance
|
||||||
- Reduces the number of git calls on known "untrackables"
|
- Reduces the number of git calls on known "untrackables"
|
||||||
- Caches many more git commands to reduce git command round-trips and parsing
|
- Caches many more git commands to reduce git command roundtrips and parsing
|
||||||
- Increases the debounce (delay) on cursor movement to reduce lag when navigating around a file
|
- Increases the debounce (delay) on cursor movement to reduce lag when navigating around a file
|
||||||
- Adds diff information (the line's previous version) into the active line hover when the current line is uncommitted
|
- Adds diff information (the line's previous version) into the active line hover when the current line is uncommitted
|
||||||
- Adds `gitlens.statusBar.alignment` settings to control the alignment of the status bar -- thanks to [PR #72](https://github.com/eamodio/vscode-gitlens/pull/72) by Zack Schuster ([@zackschuster](https://github.com/zackschuster))!
|
- Adds `gitlens.statusBar.alignment` settings to control the alignment of the status bar -- thanks to [PR #72](https://github.com/eamodio/vscode-gitlens/pull/72) by Zack Schuster ([@zackschuster](https://github.com/zackschuster))!
|
||||||
@@ -402,7 +128,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
|
|||||||
|
|
||||||
## [3.4.5] - 2017-04-13
|
## [3.4.5] - 2017-04-13
|
||||||
### Added
|
### Added
|
||||||
- Completely overhauls the [GitLens documentation](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens) and messaging -- make sure to check it out to see all the powerful features GitLen provides!
|
- Completely overhauls the [GitLens documentation](https://github.com/eamodio/vscode-gitlens/blob/master/README.md) and messaging -- make sure to check it out to see all the powerful features GitLen provides!
|
||||||
- Adds `gitlens.blame.annotation.activeLineDarkColor` & `gitlens.blame.annotation.activeLineLightColor` settings to control the colors of the active line blame annotation
|
- Adds `gitlens.blame.annotation.activeLineDarkColor` & `gitlens.blame.annotation.activeLineLightColor` settings to control the colors of the active line blame annotation
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
@@ -534,7 +260,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
|
|||||||
### Fixed
|
### Fixed
|
||||||
- Fixes issue with `gitlens.diffWithPrevious` command execution via code lens when the code lens was not at the document/file level
|
- Fixes issue with `gitlens.diffWithPrevious` command execution via code lens when the code lens was not at the document/file level
|
||||||
- Fixes issue where full shas were displayed on the file/blame history explorers
|
- Fixes issue where full shas were displayed on the file/blame history explorers
|
||||||
- Fixes [#30](https://github.com/eamodio/vscode-gitlens/issues/30) - Diff with Working Tree fails from repo/commit quick pick list if file was renamed (and the commit was before the rename)
|
- Fixes [#30](https://github.com/eamodio/vscode-gitlens/issues/30) - Diff with Working Tree fails from repo/commit quickpick list if file was renamed (and the commit was before the rename)
|
||||||
- Fixes various other quick pick menu command issues when a file was renamed
|
- Fixes various other quick pick menu command issues when a file was renamed
|
||||||
- Fixes various issues when caching is disabled
|
- Fixes various issues when caching is disabled
|
||||||
- Fixes issues with parsing commits history
|
- Fixes issues with parsing commits history
|
||||||
@@ -637,7 +363,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
|
|||||||
|
|
||||||
## [2.9.0]
|
## [2.9.0]
|
||||||
### Changed
|
### Changed
|
||||||
- To accommodate the realization that blame information is invalid when a file has unsaved changes, the following behavior changes have been made
|
- To accomodate the realization that blame information is invalid when a file has unsaved changes, the following behavior changes have been made
|
||||||
- Status bar blame information will hide
|
- Status bar blame information will hide
|
||||||
- Code lens change to a `Cannot determine...` message and become unclickable
|
- Code lens change to a `Cannot determine...` message and become unclickable
|
||||||
- Many menu choices and commands will hide
|
- Many menu choices and commands will hide
|
||||||
@@ -675,7 +401,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- Fixes [#34](https://github.com/eamodio/vscode-gitlens/issues/34) - Open file should open the selected version of the file
|
- Fixes [#34](https://github.com/eamodio/vscode-gitlens/issues/34) - Open file should open the selected version of the file
|
||||||
- Fixes some issue where some editors opened by the quick pick would not be opened in preview tabs
|
- Fixes some issue where some editors opened by the quickpick would not be opened in preview tabs
|
||||||
- Fixes issue where copy to clipboard commands would fail if there was no active editor
|
- Fixes issue where copy to clipboard commands would fail if there was no active editor
|
||||||
- Fixes issue where active line annotations would show for opened versioned files
|
- Fixes issue where active line annotations would show for opened versioned files
|
||||||
- Fixes issue where code lens compare commands on opened versioned files would fail
|
- Fixes issue where code lens compare commands on opened versioned files would fail
|
||||||
|
|||||||
222
README.md
222
README.md
@@ -1,48 +1,44 @@
|
|||||||
[](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
|
[](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
|
||||||
[](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
|
[](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
|
||||||
[](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
|
[](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
|
||||||
[](https://join.slack.com/t/vscode-dev-community/shared_invite/enQtMjIxOTgxNDE3NzM0LWU5M2ZiZDU1YjBlMzdlZjA2YjBjYzRhYTM5NTgzMTAxMjdiNWU0ZmQzYWI3MWU5N2Q1YjBiYmQ4MzY0NDE1MzY)
|
[](https://gitter.im/vscode-gitlens/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||||
|
|
||||||
# GitLens
|
# GitLens
|
||||||
|
|
||||||
GitLens **supercharges** the built-in Visual Studio Code Git capabilities. It helps you to **visualize code authorship** at a glance via Git blame annotations and code lens, **seamlessly navigate and explore** the history of a file or branch, **gain valuable insights** via powerful comparison commands, and so much more.
|
GitLens **supercharges** the built-in Visual Studio Code Git capabilities. It helps you to **visualize code authorship** at a glance via Git blame annotations and code lens, **seamlessly navigate and explore** the history of a file or branch, **gain valuable insights** via powerful comparision commands, and so much more.
|
||||||
|
|
||||||
GitLens provides an unobtrusive blame annotation at the end of the current line, a status bar item showing the commit information (author and date, by default) of the current line, code lens showing the most recent commit and # of authors of the file and/or code block, and many commands for exploring commits and histories, comparing and navigating revisions, stash access, repository status, and more. GitLens is also [highly customizable](#extension-settings) to meet your specific needs — find code lens intrusive or the current line blame annotation distracting — no problem, it is easy to [turn them off or change how they behave](#extension-settings).
|
GitLens provides an unobtrusive blame annotation at the end of the current line, a status bar item showing the commit information (author and date, by default) of the current line, code lens showing the most recent commit and # of authors of the file and/or code block, and many commands for exploring commits and histories, comparing and navigating revisions, stash access, repository status, and more. GitLens is also [highly customizable](#extension-settings) to meet your specific needs — find code lens intrusive or the current line blame annotation distracting — no problem, it is easy to [turn them off or change how they behave](#extension-settings).
|
||||||
|
|
||||||
### Preview — featuring blame annotations, code lens, status bar details, quick pick menus for navigation and exploration, compare with previous, and more
|
## Previews
|
||||||
|
#### Featuring code lens, file blame annotations, and navigation and exploration via quick pick menus
|
||||||
|
|
||||||
|
|
||||||
|
#### Featuring current line blame annotation and hovers, status bar commit details, quick pick menus, compare with previous, and more
|
||||||
|
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
### Git Blame Annotations
|
#### Git Blame Annotations
|
||||||
|
|
||||||
- Adds an unobtrusive, highly [customizable](#line-blame-annotation-settings) and [themeable](#theme-settings), **Git blame annotation** to the end of the current line ([optional](#line-blame-annotation-settings), on by default)
|
- Adds an unobtrusive, highly [customizable](#line-blame-annotation-settings) and [themeable](#theme-settings), **Git blame annotation** to the end of the current line ([optional](#line-blame-annotation-settings), on by default)
|
||||||
|
|
||||||
|
|
||||||
- Contains the author, date, and message of the line's most recent commit, by [default](#line-blame-annotation-settings)
|
- Contains the author, date, and message of the line's most recent commit, by [default](#line-blame-annotation-settings)
|
||||||
- Adds a `details` hover annotation to the current line annotation, which provides more commit details ([optional](#line-blame-annotation-settings), on by default)
|
- Also adds a `details` hover annotation to the current line annotation which provides more commit details ([optional](#line-blame-annotation-settings), on by default)
|
||||||
- Clicking the commit id will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
|
- Also adds a `changes` (diff) hover annotation to the current line annotation which provides **instant** access to the line's previous version ([optional](#line-blame-annotation-settings), on by default)
|
||||||
- Adds a `changes` (diff) hover annotation to the current line annotation, which provides **instant** access to the line's previous version ([optional](#line-blame-annotation-settings), on by default)
|
|
||||||
- Clicking on `Changes` will run the `Compare File Revisions` command (`gitlens.diffWith`)
|
|
||||||
- Clicking the current and previous commit ids will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
|
|
||||||
- Clicking on external link icon will run the the `Open Commit in Remote` command (`gitlens.openCommitInRemote`)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Adds on-demand, beautiful, highly [customizable](#file-blame-annotation-settings) and [themeable](#theme-settings), **Git blame annotations** of the whole file
|
- Adds on-demand, beautiful, highly [customizable](#file-blame-annotation-settings) and [themeable](#theme-settings), **Git blame annotations** of the whole file
|
||||||
|
|
||||||
|
|
||||||
- Choose between `gutter` (default) and `hover` [annotation styles](#file-blame-annotation-settings)
|
- Choose between `gutter` (default) and `hover` [annotation styles](#file-blame-annotation-settings)
|
||||||
- Contains the commit message and date, by [default](#file-blame-annotation-settings)
|
- Contains the commit message and date, by [default](#file-blame-annotation-settings)
|
||||||
- Adds a `details` hover annotation to the line's annotation, which provides more commit details ([optional](#file-blame-annotation-settings), on by default)
|
- Also adds a `details` hover annotation to the line's annotation which provides more commit details ([optional](#file-blame-annotation-settings), on by default)
|
||||||
- Clicking the commit id will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
|
|
||||||
- Adds a `heatmap` (age) indicator to the gutter annotations (on right edge by [default](#file-blame-annotation-settings)), which provides an easy, at-a-glance way to tell the age of a line ([optional](#file-blame-annotation-settings), on by default)
|
|
||||||
- Indicator ranges from bright yellow (newer) to dark brown (older)
|
|
||||||
- Press `Escape` to quickly toggle the annotations off
|
|
||||||
|
|
||||||
- Adds [customizable](#status-bar-settings) **blame information** about the current line to the **status bar** ([optional](#status-bar-settings), on by default)
|
- Adds [customizable](#status-bar-settings) **blame information** about the current line to the **status bar** ([optional](#status-bar-settings), on by default)
|
||||||
|
|
||||||
|
|
||||||
- Contains the commit author and date, by [default](#status-bar-settings)
|
- Contains the commit author and date, by [default](#status-bar-settings)
|
||||||
- Clicking the status bar item will, by [default](#status-bar-settings), show a **commit details quick pick menu** with commands for comparing, navigating and exploring commits, and more
|
- Clicking the status bar item will, by [default](#status-bar-settings), show a **commit details quick pick menu** with commands for comparing, navigating and exploring commits, and more
|
||||||
- Provides [customizable](#status-bar-settings) click behavior — choose between one of the following
|
- Provides [customizable](#status-bar-settings) click behavior — choose between one of the following
|
||||||
@@ -61,24 +57,11 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
|
|||||||
- Adds a `Toggle Line Blame Annotations` command (`gitlens.toggleLineBlame`) to toggle the current line blame annotations on and off
|
- Adds a `Toggle Line Blame Annotations` command (`gitlens.toggleLineBlame`) to toggle the current line blame annotations on and off
|
||||||
- Also adds a `Show Line Blame Annotations` command (`gitlens.showLineBlame`)
|
- Also adds a `Show Line Blame Annotations` command (`gitlens.showLineBlame`)
|
||||||
|
|
||||||
### Git Recent Changes Annotations
|
#### Git Code Lens
|
||||||
|
|
||||||
- Adds on-demand, [customizable](#file-recent-changes-annotation-settings) and [themeable](#theme-settings), **recent changes annotations** of the whole file
|
|
||||||
- Highlights all of lines changed in the most recent commit
|
|
||||||
- Adds a `details` hover annotation to each line, which provides more commit details ([optional](#file-blame-annotation-settings), on by default)
|
|
||||||
- Clicking the commit id will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
|
|
||||||
- Adds a `changes` (diff) hover annotation to each line, which provides **instant** access to the line's previous version ([optional](#file-recent-changes-annotation-settings), on by default)
|
|
||||||
- Clicking on `Changes` will run the `Compare File Revisions` command (`gitlens.diffWith`)
|
|
||||||
- Clicking the current and previous commit ids will run the `Show Commit Details` command (`gitlens.showQuickCommitDetails`)
|
|
||||||
- Press `Escape` to quickly toggle the annotations off
|
|
||||||
|
|
||||||
- Adds `Toggle Recent File Changes Annotations` command (`gitlens.toggleFileRecentChanges`) to toggle the recent changes annotations on and off
|
|
||||||
|
|
||||||
### Git Code Lens
|
|
||||||
|
|
||||||
- Adds **code lens** to the top of the file and on code blocks ([optional](#code-lens-settings), on by default)
|
- Adds **code lens** to the top of the file and on code blocks ([optional](#code-lens-settings), on by default)
|
||||||
|
|
||||||
|
|
||||||
- **Recent Change** — author and date of the most recent commit for the file or code block
|
- **Recent Change** — author and date of the most recent commit for the file or code block
|
||||||
- Clicking the code lens will, by [default](#code-lens-settings), show a **commit file details quick pick menu** with commands for comparing, navigating and exploring commits, and more
|
- Clicking the code lens will, by [default](#code-lens-settings), show a **commit file details quick pick menu** with commands for comparing, navigating and exploring commits, and more
|
||||||
- **Authors** — number of authors of the file or code block and the most prominent author (if there is more than one)
|
- **Authors** — number of authors of the file or code block and the most prominent author (if there is more than one)
|
||||||
@@ -95,96 +78,39 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
|
|||||||
|
|
||||||
- Adds a `Toggle Git Code Lens` command (`gitlens.toggleCodeLens`) with a shortcut of `shift+alt+b` to toggle the code lens on and off
|
- Adds a `Toggle Git Code Lens` command (`gitlens.toggleCodeLens`) with a shortcut of `shift+alt+b` to toggle the code lens on and off
|
||||||
|
|
||||||
### Powerful Comparison Tools
|
#### Powerful Comparison Tools
|
||||||
|
|
||||||
- Effortlessly navigate between comparisons via the `alt+,` and `alt+.` shortcut keys to go back and forth through a file's revisions
|
- Effortlessly navigate between comparisions via the `alt+,` and `alt+.` shortcut keys to go back and forth through a file's revisions
|
||||||
|
|
||||||
- Provides easy access to the following comparison commands via the `Command Palette` as well as in context via the many provided quick pick menus
|
- Provides easy access to the following comparison commands via the `Command Palette` as well as in context via the many provided quick pick menus
|
||||||
|
|
||||||
- Adds a `Directory Compare` command (`gitlens.diffDirectory`) to open the configured Git difftool to compare directories between branches
|
- Adds a `Directory Compare` command (`gitlens.diffDirectory`) to open the configured Git difftool to compare directories between branches
|
||||||
|
|
||||||
- Adds a `Compare File with Branch...` command (`gitlens.diffWithBranch`) to compare the active file with the same file on the selected branch
|
- Adds a `Compare File with...` command (`gitlens.diffWithBranch`) to compare the active file with the same file on the selected branch
|
||||||
|
|
||||||
- Adds a `Compare File with Next Revision` command (`gitlens.diffWithNext`) with a shortcut of `alt+.` to compare the active file/diff with the next commit revision
|
- Adds a `Compare File with Next Commit` command (`gitlens.diffWithNext`) with a shortcut of `alt+.` to compare the active file/diff with the next commit revision
|
||||||
|
|
||||||
- Adds a `Compare File with Previous Revision` command (`gitlens.diffWithPrevious`) with a shortcut of `alt+,` to compare the active file/diff with the previous commit revision
|
- Adds a `Compare File with Previous` command (`gitlens.diffWithPrevious`) with a shortcut of `alt+,` to compare the active file/diff with the previous commit revision
|
||||||
|
|
||||||
- Adds a `Compare Line Revision with Previous` command (`gitlens.diffLineWithPrevious`) with a shortcut of `shift+alt+,` to compare the active file/diff with the previous line commit revision
|
- Adds a `Compare Line Commit with Previous` command (`gitlens.diffLineWithPrevious`) with a shortcut of `shift+alt+,` to compare the active file/diff with the previous line commit revision
|
||||||
|
|
||||||
- Adds a `Compare File with Revision...` command (`gitlens.diffWithRevision`) to compare the active file with the selected revision of the same file
|
- Adds a `Compare File with Working Tree` command (`gitlens.diffWithWorking`) with a shortcut of `shift+alt+w` to compare the most recent commit revision of the active file/diff with the working tree
|
||||||
|
|
||||||
- Adds a `Compare File with Working Revision` command (`gitlens.diffWithWorking`) with a shortcut of `shift+alt+w` to compare the most recent commit revision of the active file/diff with the working tree
|
- Adds a `Compare Line Commit with Working Tree` command (`gitlens.diffLineWithWorking`) with a shortcut of `alt+w` to compare the commit revision of the active line with the working tree
|
||||||
|
|
||||||
- Adds a `Compare Line Revision with Working` command (`gitlens.diffLineWithWorking`) with a shortcut of `alt+w` to compare the commit revision of the active line with the working tree
|
#### Navigate and Explore
|
||||||
|
|
||||||
### Navigate and Explore
|
|
||||||
|
|
||||||
- Adds a [customizable](#gitlens-custom-view-settings) `GitLens` custom view to the Explorer activity
|
|
||||||
|
|
||||||
- `Repository View` - provides a full repository explorer
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- `Repository Status` node — provides the status of the repository
|
|
||||||
- Provides the name of the current branch, its upstream tracking branch (if available), and its upstream status (if available)
|
|
||||||
- Provides indicator dots on the repository icon which denote the following:
|
|
||||||
- `None` - up-to-date with the upstream
|
|
||||||
- `Green` - ahead of the upstream
|
|
||||||
- `Red` - behind the upstream
|
|
||||||
- `Yellow` - both ahead of and behind the upstream
|
|
||||||
- Provides additional nodes, if the current branch is not synchronized with the upstream, to quickly see and explore the specific commits ahead and/or behind the upstream
|
|
||||||
- Provides a context menu with `Open Repository in Remote`, and `Refresh` commands
|
|
||||||
|
|
||||||
- `Branches` node — provides a list of the local branches
|
|
||||||
- Indicates which branch is the current branch and [optionally](#gitlens-custom-view-settings) shows the remote tracking branch
|
|
||||||
- Expand each branch to easily see its revision (commit) history
|
|
||||||
- Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
|
|
||||||
- Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
|
|
||||||
|
|
||||||
- Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Open All Changes`, `Open All Changes with Working Tree`, `Open Files`, `Open Revisions`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`, `Show Commit Details`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each branch with `Open Branch in Remote`, and `Refresh` commands
|
|
||||||
- Provides a context menu with `Open Branches in Remote`, and `Refresh` commands
|
|
||||||
|
|
||||||
- `Remotes` node — provides a list of remotes
|
|
||||||
- Indicates the direction of the remote (fetch, push, both), remote service (if applicable), and repository path
|
|
||||||
- Expand each remote to see its list of branches
|
|
||||||
- Expand each branch to easily see its revision (commit) history
|
|
||||||
- Expand each revision (commit) to quickly see the set of files changed, complete with status indicators for adds, changes, renames, and deletes
|
|
||||||
- Provides a context menu on each changed file with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, `Show File History`, and `Show Commit File Details` commands
|
|
||||||
- Provides a context menu on each revision (commit) with `Open Commit in Remote`, `Open All Changes`, `Open All Changes with Working Tree`, `Open Files`, `Open Revisions`, `Copy Commit ID to Clipboard`, `Copy Commit Message to Clipboard`,`Show Commit Details`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each remote with `Open Branches in Remote`, `Open Repository in Remote`, and `Refresh` commands
|
|
||||||
- Provides a context menu with a `Refresh` command
|
|
||||||
|
|
||||||
- `Stashes` node — provides a list of stashed changes
|
|
||||||
- Expand each stash to quickly see the set of files stashed, complete with status indicators for adds, changes, renames, and deletes
|
|
||||||
- Provides a context menu with `Stash Changes`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each stash with `Apply Stashed Changes` (confirmation required), `Delete Stashed Changes` (confirmation required), `Open All Changes`, `Open All Changes with Working Tree`, `Open Files`, `Open Revisions`, `Copy Commit Message to Clipboard`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each stashed file with `Apply Changes`, `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, and `Show File History` commands
|
|
||||||
|
|
||||||
- `History View` - provides the revision history of the active file
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Automatically updates to track the active editor
|
|
||||||
- Provides a context menu with `Open File`, `Open File in Remote`, and `Refresh` commands
|
|
||||||
- Provides a context menu on each revision (commit) with `Open Changes`, `Open Changes with Working Tree`, `Open File`, `Open Revision`, `Open File in Remote`, `Open Revision in Remote`, `Apply Changes`, and `Show Commit File Details` commands
|
|
||||||
|
|
||||||
- Quickly switch between views using the `Switch to Repository View` or `Switch to History View` commands
|
|
||||||
- Provides toolbar commands to `Search Commits`, `Switch to Repository View` or `Switch to History View`, and `Refresh`
|
|
||||||
|
|
||||||
- Adds a `Search Commits` command (`gitlens.showCommitSearch`) with a shortcut of `alt+/` to search for commits by message, author, file(s), or commit id
|
- Adds a `Search Commits` command (`gitlens.showCommitSearch`) with a shortcut of `alt+/` to search for commits by message, author, file(s), or commit id
|
||||||
|
|
||||||
- Adds commands to open files, commits, branches, and the repository in the supported remote services, currently **BitBucket, GitHub, GitLab, and Visual Studio Team Services** — only available if a Git upstream service is configured in the repository
|
- Adds commands to open files, commits, branches, and the repository in the supported remote services, currently **BitBucket, GitHub, GitLab, and Visual Studio Team Services** — only available if a Git upstream service is configured in the repository
|
||||||
- Also supports [remote services with custom domains](#custom-remotes-settings), such as **BitBucket, Bitbucket Server (previously called Stash), GitHub, GitHub Enterprise, GitLab**
|
|
||||||
- `Open Branches in Remote` command (`gitlens.openBranchesInRemote`) — opens the branches in the supported remote service
|
|
||||||
- `Open Branch in Remote` command (`gitlens.openBranchInRemote`) — opens the current branch commits in the supported remote service
|
- `Open Branch in Remote` command (`gitlens.openBranchInRemote`) — opens the current branch commits in the supported remote service
|
||||||
- `Open Commit in Remote` command (`gitlens.openCommitInRemote`) — opens the commit revision of the active line in the supported remote service
|
- `Open Line Commit in Remote` command (`gitlens.openCommitInRemote`) — opens the commit revision of the active line in the supported remote service
|
||||||
- `Open File in Remote` command (`gitlens.openFileInRemote`) — opens the active file/revision in the supported remote service
|
- `Open File in Remote` command (`gitlens.openFileInRemote`) — opens the active file/revision in the supported remote service
|
||||||
- `Open Repository in Remote` command (`gitlens.openRepoInRemote`) — opens the repository in the supported remote service
|
- `Open Repository in Remote` command (`gitlens.openRepoInRemote`) — opens the repository in the supported remote service
|
||||||
|
|
||||||
- Adds a `Show Current Branch History` command (`gitlens.showQuickRepoHistory`) with a shortcut of `shift+alt+h` to show a paged **branch history quick pick menu** of the current branch for exploring its commit history
|
- Adds a `Show Current Branch History` command (`gitlens.showQuickRepoHistory`) with a shortcut of `shift+alt+h` to show a paged **branch history quick pick menu** of the current branch for exploring its commit history
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Provides entries to `Show Commit Search` and `Open Branch in <remote-service>` when available
|
- Provides entries to `Show Commit Search` and `Open Branch in <remote-service>` when available
|
||||||
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
||||||
@@ -195,7 +121,7 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
|
|||||||
|
|
||||||
- Adds a `Show File History` command (`gitlens.showQuickFileHistory`) to show a paged **file history quick pick menu** of the active file for exploring its commit history
|
- Adds a `Show File History` command (`gitlens.showQuickFileHistory`) to show a paged **file history quick pick menu** of the active file for exploring its commit history
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Provides entries to `Show Branch History` and `Open File in <remote-service>` when available
|
- Provides entries to `Show Branch History` and `Open File in <remote-service>` when available
|
||||||
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
||||||
@@ -203,17 +129,18 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
|
|||||||
|
|
||||||
- Adds a `Show Commit Details` command (`gitlens.showQuickCommitDetails`) to show a **commit details quick pick menu** of the most recent commit of the active file
|
- Adds a `Show Commit Details` command (`gitlens.showQuickCommitDetails`) to show a **commit details quick pick menu** of the most recent commit of the active file
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Quickly see the set of files changed in the commit, complete with status indicators for adds, changes, renames, and deletes
|
- Quickly see the set of files changed in the commit, complete with status indicators for adds, changes, renames, and deletes
|
||||||
- Provides entries to `Copy to Clipboard`, `Directory Compare`, `Open Changed Files`, `Open File in <remote-service>` when available, and more
|
- Provides entries to `Copy to Clipboard`, `Directory Compare`, `Open Changed Files`, `Open File in <remote-service>` when available, and more
|
||||||
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
||||||
- Use the `alt+right arrow` shortcut on an entry to execute it without closing the quick pick menu, if possible — commands that open windows outside of VS Code will still close the quick pick menu unless [`"gitlens.advanced.quickPick.closeOnFocusOut": false`](#extension-settings) is set
|
- Use the `alt+right arrow` shortcut on an entry to execute it without closing the quick pick menu, if possible — commands that open windows outside of VS Code will still close the quick pick menu unless [`"gitlens.advanced.quickPick.closeOnFocusOut": false`](#extension-settings) is set
|
||||||
- Use the `alt+right arrow` shortcut on a file entry in the `Changed Files` section to preview the comparison of the current revision with the previous one
|
- Use the `alt+right arrow` shortcut on a file entry in the `Changed Files` section to preview the current revision of the while leaving the quick pick menu open
|
||||||
|
- NOTE: Once [vscode issue #10568](https://github.com/Microsoft/vscode/issues/10568) is resolved this will change to preview the comparison of the current revision with the previous one
|
||||||
|
|
||||||
- Adds a `Show Commit File Details` command (`gitlens.showQuickCommitFileDetails`) with a shortcut of `alt+c` to show a **file commit details quick pick menu** of the most recent commit of the active file
|
- Adds a `Show Line Commit Details` command (`gitlens.showQuickCommitFileDetails`) with a shortcut of `alt+c` to show a **file commit details quick pick menu** of the most recent commit of the active file
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Provides entries to `Show Commit Details`, `Show File History`, `Compare File with...`, `Copy to Clipboard`, `Open File`, `Open File in <remote-service>` when available, and more
|
- Provides entries to `Show Commit Details`, `Show File History`, `Compare File with...`, `Copy to Clipboard`, `Open File`, `Open File in <remote-service>` when available, and more
|
||||||
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
||||||
@@ -221,33 +148,35 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
|
|||||||
|
|
||||||
- Adds a `Show Repository Status` command (`gitlens.showQuickRepoStatus`) with a shortcut of `alt+s` to show a **repository status quick pick menu** for visualizing the current repository status
|
- Adds a `Show Repository Status` command (`gitlens.showQuickRepoStatus`) with a shortcut of `alt+s` to show a **repository status quick pick menu** for visualizing the current repository status
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Quickly see upstream status (if an Git upstream is configured) — complete with ahead and behind information
|
- Quickly see upstream status (if an Git upstream is configured) — complete with ahead and behind information
|
||||||
- If you are ahead of the upstream, an entry will be shown with the number of commits ahead. Choosing it will show a limited **branch history quick pick menu** containing just the commits ahead of the upstream
|
- If you are ahead of the upstream, an entry will be shown with the number of commits ahead. Chosing it will show a limited **branch history quick pick menu** containing just the commits ahead of the upstream
|
||||||
- If you are behind the upstream, an entry will be shown with the number of commits behind. Choosing it will show a limited **branch history quick pick menu** containing just the commits behind the upstream
|
- If you are behind the upstream, an entry will be shown with the number of commits behind. Chosing it will show a limited **branch history quick pick menu** containing just the commits behind the upstream
|
||||||
- Quickly see all working changes, both staged and unstaged, complete with status indicators for adds, changes, renames, and deletes
|
- Quickly see all working changes, both staged and unstaged, complete with status indicators for adds, changes, renames, and deletes
|
||||||
- Provides entries to `Show Stashed Changes`, `Open Changed Files`, and `Close Unchanged Files`
|
- Provides entries to `Show Stashed Changes`, `Open Changed Files`, and `Close Unchanged Files`
|
||||||
- Use the `alt+right arrow` shortcut on an entry to execute it without closing the quick pick menu, if possible — commands that open windows outside of VS Code will still close the quick pick menu unless [`"gitlens.advanced.quickPick.closeOnFocusOut": false`](#extension-settings) is set
|
- Use the `alt+right arrow` shortcut on an entry to execute it without closing the quick pick menu, if possible — commands that open windows outside of VS Code will still close the quick pick menu unless [`"gitlens.advanced.quickPick.closeOnFocusOut": false`](#extension-settings) is set
|
||||||
- Use the `alt+right arrow` shortcut on a file entry in the `Staged Files` or `Unstaged Files` sections to preview the comparison of the working file with the previous revision
|
- Use the `alt+right arrow` shortcut on a file entry in the `Staged Files` or `Unstaged Files` sections to preview the working file while leaving the quick pick menu open
|
||||||
|
- NOTE: Once [vscode issue #10568](https://github.com/Microsoft/vscode/issues/10568) is resolved this will change to preview the comparison of the working file with the previous revision
|
||||||
|
|
||||||
- Adds a `Show Stashed Changes` command (`gitlens.showQuickStashList`) to show a **stashed changes quick pick menu** for exploring your repository stash history
|
- Adds a `Show Stashed Changes` command (`gitlens.showQuickStashList`) to show a **stashed changes quick pick menu** for exploring your repository stash history
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Provides entries to `Stash Changes`
|
- Provides entries to `Stash Changes`
|
||||||
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
||||||
|
|
||||||
- Choosing a stash entry shows a **stash details quick pick menu** which is very similar to the **commit details quick pick menu** above
|
- Chosing a stash entry shows a **stash details quick pick menu** which is very similar to the **commit details quick pick menu** above
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
- Quickly see the set of files changed in the stash, complete with status indicators for adds, changes, renames, and deletes
|
- Quickly see the set of files changed in the stash, complete with status indicators for adds, changes, renames, and deletes
|
||||||
- Provides entries to `Copy Message to Clipboard`, `Directory Compare`, and `Open Changed Files`
|
- Provides entries to `Copy Message to Clipboard`, `Directory Compare`, and `Open Changed Files`
|
||||||
- Provides entries to `Apply Stashed Changes` and `Delete Stashed Changes` — both require a confirmation
|
- Provides entries to `Apply Stashed Changes` and `Delete Stashed Changes` — both require a confirmation
|
||||||
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
- Navigate back to the previous quick pick menu via `alt+left arrow`, if available
|
||||||
- Use the `alt+right arrow` shortcut on an entry to execute it without closing the quick pick menu, if possible — commands that open windows outside of VS Code will still close the quick pick menu unless [`"gitlens.advanced.quickPick.closeOnFocusOut": false`](#extension-settings) is set
|
- Use the `alt+right arrow` shortcut on an entry to execute it without closing the quick pick menu, if possible — commands that open windows outside of VS Code will still close the quick pick menu unless [`"gitlens.advanced.quickPick.closeOnFocusOut": false`](#extension-settings) is set
|
||||||
- Use the `alt+right arrow` shortcut on a file entry in the `Changed Files` section to preview the comparison of the current revision with the previous one
|
- Use the `alt+right arrow` shortcut on a file entry in the `Changed Files` section to preview the current revision of the while leaving the quick pick menu open
|
||||||
|
- NOTE: Once [vscode issue #10568](https://github.com/Microsoft/vscode/issues/10568) is resolved this will change to preview the comparison of the current revision with the previous one
|
||||||
|
|
||||||
- Adds a `Show Last Opened Quick Pick` command (`gitlens.showLastQuickPick`) with a shortcut of `alt+-` to quickly get back to where you were when the last GitLens quick pick menu closed
|
- Adds a `Show Last Opened Quick Pick` command (`gitlens.showLastQuickPick`) with a shortcut of `alt+-` to quickly get back to where you were when the last GitLens quick pick menu closed
|
||||||
|
|
||||||
@@ -257,11 +186,11 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
|
|||||||
- Adds a `Open Blame History Explorer` command (`gitlens.showBlameHistory`) to show a **blame history explorer** (peek style) to visualize the blame history of a file or code block
|
- Adds a `Open Blame History Explorer` command (`gitlens.showBlameHistory`) to show a **blame history explorer** (peek style) to visualize the blame history of a file or code block
|
||||||
- Likely to be deprecated in a future release, add your voice to [#66](https://github.com/eamodio/vscode-gitlens/issues/66) if you feel it should not be removed
|
- Likely to be deprecated in a future release, add your voice to [#66](https://github.com/eamodio/vscode-gitlens/issues/66) if you feel it should not be removed
|
||||||
|
|
||||||
### And More
|
#### And More
|
||||||
|
|
||||||
- Adds a `Copy Commit ID to Clipboard` command (`gitlens.copyShaToClipboard`) to copy the commit id (sha) of the active line to the clipboard or from the most recent commit to the current branch, if there is no active editor
|
- Adds a `Copy Commit ID to Clipboard` command (`gitlens.copyShaToClipboard`) to copy the commit id (sha) of the active line to the clipboard
|
||||||
|
|
||||||
- Adds a `Copy Commit Message to Clipboard` command (`gitlens.copyMessageToClipboard`) to copy the commit message of the active line to the clipboard or from the most recent commit to the current branch, if there is no active editor
|
- Adds a `Copy Commit Message to Clipboard` command (`gitlens.copyMessageToClipboard`) to copy the commit message of the active line to the clipboard
|
||||||
|
|
||||||
- Adds a `Open Changed Files` command (`gitlens.openChangedFiles`) to open any files with working tree changes
|
- Adds a `Open Changed Files` command (`gitlens.openChangedFiles`) to open any files with working tree changes
|
||||||
|
|
||||||
@@ -270,7 +199,6 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
|
|||||||
- Adds a `Apply Stashed Changes` command (`gitlens.stashApply`) to chose a stash entry to apply to the working tree from a quick pick menu
|
- Adds a `Apply Stashed Changes` command (`gitlens.stashApply`) to chose a stash entry to apply to the working tree from a quick pick menu
|
||||||
|
|
||||||
- Adds a `Stash Changes` command (`gitlens.stashSave`) to save any working tree changes to the stash — can optionally provide a stash message
|
- Adds a `Stash Changes` command (`gitlens.stashSave`) to save any working tree changes to the stash — can optionally provide a stash message
|
||||||
- Also adds the command to the Source Control items context menu to stash an individual or group of files, works with multi-select too!
|
|
||||||
|
|
||||||
## Insiders
|
## Insiders
|
||||||
|
|
||||||
@@ -284,15 +212,10 @@ GitLens is highly customizable and provides many configuration settings to allow
|
|||||||
|
|
||||||
|Name | Description
|
|Name | Description
|
||||||
|-----|------------
|
|-----|------------
|
||||||
|`gitlens.defaultDateFormat`|Specifies how all absolute dates will be formatted by default\nSee https://momentjs.com/docs/#/displaying/format/ for valid formats
|
|
||||||
|`gitlens.insiders`|Opts into the insiders channel -- provides access to upcoming features
|
|`gitlens.insiders`|Opts into the insiders channel -- provides access to upcoming features
|
||||||
|`gitlens.outputLevel`|Specifies how much (if any) output will be sent to the GitLens output channel
|
|`gitlens.outputLevel`|Specifies how much (if any) output will be sent to the GitLens output channel
|
||||||
|
|
||||||
### Blame Settings
|
### Blame Annotation Settings
|
||||||
|
|
||||||
|Name | Description
|
|
||||||
|-----|------------
|
|
||||||
|`gitlens.blame.ignoreWhitespace`|Specifies whether or not to ignore whitespace when comparing revisions during blame operations
|
|
||||||
|
|
||||||
#### File Blame Annotation Settings
|
#### File Blame Annotation Settings
|
||||||
|
|
||||||
@@ -315,7 +238,7 @@ GitLens is highly customizable and provides many configuration settings to allow
|
|||||||
|
|
||||||
|Name | Description
|
|Name | Description
|
||||||
|-----|------------
|
|-----|------------
|
||||||
|`gitlens.blame.line.enabled`|Specifies whether or not to provide a blame annotation for the current line, by default<br />Use the `gitlens.toggleLineBlame` command to toggle the annotations on and off for the current session
|
|`gitlens.blame.line.enabled`|Specifies whether or not to provide a blame annotation for the current line
|
||||||
|`gitlens.blame.line.annotationType`|Specifies the type of blame annotations that will be shown for the current line<br />`trailing` - adds an annotation to the end of the current line<br />`hover` - shows annotations when hovering over the current line
|
|`gitlens.blame.line.annotationType`|Specifies the type of blame annotations that will be shown for the current line<br />`trailing` - adds an annotation to the end of the current line<br />`hover` - shows annotations when hovering over the current line
|
||||||
|`gitlens.annotations.line.trailing.format`|Specifies the format of the trailing blame annotations<br />Available tokens<br />`${id}` - commit id<br />`${author}` - commit author<br />`${message}` - commit message<br />`${ago}` - relative commit date (e.g. 1 day ago)<br />`${date}` - formatted commit date (format specified by `gitlens.annotations.line.trailing.dateFormat`)<br />`${authorAgo}` - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|
|`gitlens.annotations.line.trailing.format`|Specifies the format of the trailing blame annotations<br />Available tokens<br />`${id}` - commit id<br />`${author}` - commit author<br />`${message}` - commit message<br />`${ago}` - relative commit date (e.g. 1 day ago)<br />`${date}` - formatted commit date (format specified by `gitlens.annotations.line.trailing.dateFormat`)<br />`${authorAgo}` - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|
||||||
|`gitlens.annotations.line.trailing.dateFormat`|Specifies how to format absolute dates (using the `${date}` token) in trailing blame annotations<br />See https://momentjs.com/docs/#/displaying/format/ for valid formats
|
|`gitlens.annotations.line.trailing.dateFormat`|Specifies how to format absolute dates (using the `${date}` token) in trailing blame annotations<br />See https://momentjs.com/docs/#/displaying/format/ for valid formats
|
||||||
@@ -325,19 +248,11 @@ GitLens is highly customizable and provides many configuration settings to allow
|
|||||||
|`gitlens.annotations.line.hover.details`|Specifies whether or not to provide a commit details hover annotation for the current line
|
|`gitlens.annotations.line.hover.details`|Specifies whether or not to provide a commit details hover annotation for the current line
|
||||||
|`gitlens.annotations.line.hover.changes`|Specifies whether or not to provide a changes (diff) hover annotation for the current line
|
|`gitlens.annotations.line.hover.changes`|Specifies whether or not to provide a changes (diff) hover annotation for the current line
|
||||||
|
|
||||||
### File Recent Changes Annotation Settings
|
|
||||||
|
|
||||||
|Name | Description
|
|
||||||
|-----|------------
|
|
||||||
|`gitlens.recentChanges.file.lineHighlight.locations`|Specifies where the highlights of the recently changed lines will be shown<br />`gutter` - adds a gutter glyph<br />`line` - adds a full-line highlight background color<br />`overviewRuler` - adds a decoration to the overviewRuler (scroll bar)
|
|
||||||
|`gitlens.annotations.file.recentChanges.hover.details`|Specifies whether or not to provide a commit details hover annotation
|
|
||||||
|`gitlens.annotations.file.recentChanges.hover.changes`|Specifies whether or not to provide a changes (diff) hover annotation
|
|
||||||
|
|
||||||
### Code Lens Settings
|
### Code Lens Settings
|
||||||
|
|
||||||
|Name | Description
|
|Name | Description
|
||||||
|-----|------------
|
|-----|------------
|
||||||
|`gitlens.codeLens.enabled`|Specifies whether or not to provide any Git code lens, by default<br />Use the `gitlens.toggleCodeLens` command to toggle the Git code lens on and off for the current session
|
|`gitlens.codeLens.enabled`|Specifies whether or not to provide any Git code lens
|
||||||
|`gitlens.codeLens.recentChange.enabled`|Specifies whether or not to show a `recent change` code lens showing the author and date of the most recent commit for the file or code block
|
|`gitlens.codeLens.recentChange.enabled`|Specifies whether or not to show a `recent change` code lens showing the author and date of the most recent commit for the file or code block
|
||||||
|`gitlens.codeLens.recentChange.command`|Specifies the command to be executed when the `recent change` code lens is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.showBlameHistory` - opens the blame history explorer<br />`gitlens.showFileHistory` - opens the file history explorer<br />`gitlens.diffWithPrevious` - compares the current committed file with the previous commit<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
|
|`gitlens.codeLens.recentChange.command`|Specifies the command to be executed when the `recent change` code lens is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.showBlameHistory` - opens the blame history explorer<br />`gitlens.showFileHistory` - opens the file history explorer<br />`gitlens.diffWithPrevious` - compares the current committed file with the previous commit<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
|
||||||
|`gitlens.codeLens.authors.enabled`|Specifies whether or not to show an `authors` code lens showing number of authors of the file or code block and the most prominent author (if there is more than one)
|
|`gitlens.codeLens.authors.enabled`|Specifies whether or not to show an `authors` code lens showing number of authors of the file or code block and the most prominent author (if there is more than one)
|
||||||
@@ -346,24 +261,6 @@ GitLens is highly customizable and provides many configuration settings to allow
|
|||||||
|`gitlens.codeLens.customLocationSymbols`|Specifies the set of document symbols where Git code lens will be shown in the document
|
|`gitlens.codeLens.customLocationSymbols`|Specifies the set of document symbols where Git code lens will be shown in the document
|
||||||
|`gitlens.codeLens.perLanguageLocations`|Specifies where Git code lens will be shown in the document for the specified languages
|
|`gitlens.codeLens.perLanguageLocations`|Specifies where Git code lens will be shown in the document for the specified languages
|
||||||
|
|
||||||
### GitLens Custom View Settings
|
|
||||||
|
|
||||||
|Name | Description
|
|
||||||
|-----|------------
|
|
||||||
|`gitlens.gitExplorer.enabled`|Specifies whether or not to show the `GitLens` custom view"
|
|
||||||
|`gitlens.gitExplorer.view`|Specifies the starting view (mode) of the `GitLens` custom view<br />`history` - shows the commit history of the active file<br />`repository` - shows a repository explorer"
|
|
||||||
|`gitlens.gitExplorer.showTrackingBranch`|Specifies whether or not to show the tracking branch when displaying local branches in the `GitLens` custom view"
|
|
||||||
|`gitlens.gitExplorer.commitFormat`|Specifies the format of committed changes in the `GitLens` custom view<br />Available tokens<br /> ${id} - commit id<br /> ${author} - commit author<br /> ${message} - commit message<br /> ${ago} - relative commit date (e.g. 1 day ago)<br /> ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br /> ${authorAgo} - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|
|
||||||
|`gitlens.gitExplorer.commitFileFormat`|Specifies the format of a committed file in the `GitLens` custom view<br />Available tokens<br /> ${file} - file name<br /> ${filePath} - file name and path<br /> ${path} - file path
|
|
||||||
|`gitlens.gitExplorer.stashFormat`|Specifies the format of stashed changes in the `GitLens` custom view<br />Available tokens<br /> ${id} - commit id<br /> ${author} - commit author<br /> ${message} - commit message<br /> ${ago} - relative commit date (e.g. 1 day ago)<br /> ${date} - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br /> ${authorAgo} - commit author, relative commit date<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|
|
||||||
|`gitlens.gitExplorer.stashFileFormat`|Specifies the format of a stashed file in the `GitLens` custom view<br />Available tokens<br /> ${file} - file name<br /> ${filePath} - file name and path<br /> ${path} - file path
|
|
||||||
|
|
||||||
### Custom Remotes Settings
|
|
||||||
|
|
||||||
|Name | Description
|
|
||||||
|-----|------------
|
|
||||||
|`gitlens.remotes`|Specifies any custom domains for remote (code-hosting) services<br />Example: ```"gitlens.remotes": [{ "domain": "git.corporate-url.com", "type": "GitHub" }]```
|
|
||||||
|
|
||||||
### Status Bar Settings
|
### Status Bar Settings
|
||||||
|
|
||||||
|Name | Description
|
|Name | Description
|
||||||
@@ -374,25 +271,18 @@ GitLens is highly customizable and provides many configuration settings to allow
|
|||||||
|`gitlens.statusBar.format`|Specifies the format of the blame information on the status bar<br />Available tokens<br />`${id}` - commit id<br />`${author}` - commit author<br />`${message}` - commit message<br />`${ago}` - relative commit date (e.g. 1 day ago)<br />`${date}` - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|
|`gitlens.statusBar.format`|Specifies the format of the blame information on the status bar<br />Available tokens<br />`${id}` - commit id<br />`${author}` - commit author<br />`${message}` - commit message<br />`${ago}` - relative commit date (e.g. 1 day ago)<br />`${date}` - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
|
||||||
|`gitlens.statusBar.dateFormat`|Specifies the date format of absolute dates shown in the blame information on the status bar<br />See https://momentjs.com/docs/#/displaying/format/ for valid formats
|
|`gitlens.statusBar.dateFormat`|Specifies the date format of absolute dates shown in the blame information on the status bar<br />See https://momentjs.com/docs/#/displaying/format/ for valid formats
|
||||||
|
|
||||||
### Strings Settings
|
|
||||||
|
|
||||||
|Name | Description
|
|
||||||
|-----|------------
|
|
||||||
|`gitlens.strings.codeLens.unsavedChanges.recentChangeAndAuthors`|Specifies the string to be shown in place of both the `recent change` and `authors` code lens when there are unsaved changes
|
|
||||||
|`gitlens.strings.codeLens.unsavedChanges.recentChangeOnly`|Specifies the string to be shown in place of the `recent change` code lens when there are unsaved changes
|
|
||||||
|`gitlens.strings.codeLens.unsavedChanges.authorsOnly`|Specifies the string to be shown in place of the `authors` code lens when there are unsaved changes
|
|
||||||
|
|
||||||
### Theme Settings
|
### Theme Settings
|
||||||
|
|
||||||
|Name | Description
|
|Name | Description
|
||||||
|-----|------------
|
|-----|------------
|
||||||
|`gitlens.theme.annotations.file.gutter.separateLines`|Specifies whether or not gutter blame annotations will have line separators
|
|`gitlens.theme.annotations.file.gutter.separateLines`|Specifies whether or not gutter blame annotations will be separated by a small gap
|
||||||
|`gitlens.theme.annotations.file.gutter.dark.backgroundColor`|Specifies the dark theme background color of the gutter blame annotations
|
|`gitlens.theme.annotations.file.gutter.dark.backgroundColor`|Specifies the dark theme background color of the gutter blame annotations
|
||||||
|`gitlens.theme.annotations.file.gutter.light.backgroundColor`|Specifies the light theme background color of the gutter blame annotations
|
|`gitlens.theme.annotations.file.gutter.light.backgroundColor`|Specifies the light theme background color of the gutter blame annotations
|
||||||
|`gitlens.theme.annotations.file.gutter.dark.foregroundColor`|Specifies the dark theme foreground color of the gutter blame annotations
|
|`gitlens.theme.annotations.file.gutter.dark.foregroundColor`|Specifies the dark theme foreground color of the gutter blame annotations
|
||||||
|`gitlens.theme.annotations.file.gutter.light.foregroundColor`|Specifies the light theme foreground color of the gutter blame annotations
|
|`gitlens.theme.annotations.file.gutter.light.foregroundColor`|Specifies the light theme foreground color of the gutter blame annotations
|
||||||
|`gitlens.theme.annotations.file.gutter.dark.uncommittedForegroundColor`|Specifies the dark theme foreground color of an uncommitted line in the gutter blame annotations
|
|`gitlens.theme.annotations.file.gutter.dark.uncommittedForegroundColor`|Specifies the dark theme foreground color of an uncommitted line in the gutter blame annotations
|
||||||
|`gitlens.theme.annotations.file.gutter.light.uncommittedForegroundColor`|Specifies the light theme foreground color of an uncommitted line in the gutter blame annotations
|
|`gitlens.theme.annotations.file.gutter.light.uncommittedForegroundColor`|Specifies the light theme foreground color of an uncommitted line in the gutter blame annotations
|
||||||
|
|`gitlens.theme.annotations.file.hover.separateLines`|Specifies whether or not hover blame annotations will be separated by a small gap (if heatmap is enabled)
|
||||||
|`gitlens.theme.annotations.line.trailing.dark.backgroundColor`|Specifies the dark theme background color of the trailing blame annotation
|
|`gitlens.theme.annotations.line.trailing.dark.backgroundColor`|Specifies the dark theme background color of the trailing blame annotation
|
||||||
|`gitlens.theme.annotations.line.trailing.light.backgroundColor`|Specifies the light theme background color of the trailing blame annotation
|
|`gitlens.theme.annotations.line.trailing.light.backgroundColor`|Specifies the light theme background color of the trailing blame annotation
|
||||||
|`gitlens.theme.annotations.line.trailing.dark.foregroundColor`|Specifies the dark theme foreground color of the trailing blame annotation
|
|`gitlens.theme.annotations.line.trailing.dark.foregroundColor`|Specifies the dark theme foreground color of the trailing blame annotation
|
||||||
@@ -406,7 +296,7 @@ GitLens is highly customizable and provides many configuration settings to allow
|
|||||||
|
|
||||||
|Name | Description
|
|Name | Description
|
||||||
|-----|------------
|
|-----|------------
|
||||||
|`gitlens.advanced.telemetry.enabled`|Specifies whether or not to enable GitLens telemetry (even if enabled still abides by the overall `telemetry.enableTelemetry` setting
|
|`gitlens.advanced.toggleWhitespace.enabled`|Specifies whether or not to toggle whitespace off then showing blame annotations (*may* be required by certain fonts/themes)
|
||||||
|`gitlens.advanced.menus`|Specifies which commands will be added to which menus
|
|`gitlens.advanced.menus`|Specifies which commands will be added to which menus
|
||||||
|`gitlens.advanced.caching.enabled`|Specifies whether git output will be cached
|
|`gitlens.advanced.caching.enabled`|Specifies whether git output will be cached
|
||||||
|`gitlens.advanced.caching.maxLines`|Specifies the threshold for caching larger documents
|
|`gitlens.advanced.caching.maxLines`|Specifies the threshold for caching larger documents
|
||||||
@@ -418,13 +308,11 @@ GitLens is highly customizable and provides many configuration settings to allow
|
|||||||
## Known Issues
|
## Known Issues
|
||||||
|
|
||||||
- If the `Copy to * clipboard` commands don't work on Linux -- `xclip` needs to be installed. You can install it via `sudo apt-get install xclip`
|
- If the `Copy to * clipboard` commands don't work on Linux -- `xclip` needs to be installed. You can install it via `sudo apt-get install xclip`
|
||||||
|
- Visible whitespace causes issues ([vscode issue #11485](https://github.com/Microsoft/vscode/issues/11485)) with the `expanded` and `compact` blame annotation styles when using a non-monospace font -- set `"gitlens.advanced.toggleWhitespace.enabled": true` if you are using a non-monospace font
|
||||||
|
|
||||||
## Contributors
|
## Contributors
|
||||||
|
|
||||||
A big thanks to the people that have contributed to this project:
|
A big thanks to the people that have contributed to this project:
|
||||||
|
|
||||||
- Amanda Cameron ([@AmandaCameron](https://github.com/AmandaCameron)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=AmandaCameron))
|
|
||||||
- Peng Lyu ([@rebornix](https://github.com/rebornix)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=rebornix))
|
|
||||||
- Aurelio Ogliari ([@nobitagit](https://github.com/nobitagit)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=nobitagit)
|
- Aurelio Ogliari ([@nobitagit](https://github.com/nobitagit)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=nobitagit)
|
||||||
- Johannes Rieken ([@jrieken](https://github.com/jrieken)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=jrieken))
|
|
||||||
- Zack Schuster ([@zackschuster](https://github.com/zackschuster)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=zackschuster)
|
- Zack Schuster ([@zackschuster](https://github.com/zackschuster)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=zackschuster)
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 312 B |
|
Before Width: | Height: | Size: 313 B After Width: | Height: | Size: 313 B |
Binary file not shown.
|
Before Width: | Height: | Size: 2.3 KiB |
@@ -1,88 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
|
|
||||||
width="92" height="20" xml:space="preserve">
|
|
||||||
<style type="text/css">
|
|
||||||
.white{fill:#FFF;}
|
|
||||||
.shadow{fill:#2e840e;}
|
|
||||||
</style>
|
|
||||||
<linearGradient id="b" x2="0" y2="100%">
|
|
||||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
|
||||||
<stop offset="1" stop-opacity=".1"/>
|
|
||||||
</linearGradient>
|
|
||||||
<clipPath id="a">
|
|
||||||
<rect width="92" height="20" rx="3" fill="#fff"/>
|
|
||||||
</clipPath>
|
|
||||||
<g clip-path="url(#a)">
|
|
||||||
<path fill="#555" d="M0 0h34v20H0z"/>
|
|
||||||
<path fill="#4c1" d="M34 0h58v20H34z"/>
|
|
||||||
<path fill="url(#b)" d="M0 0h92v20H0z"/>
|
|
||||||
</g>
|
|
||||||
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
|
|
||||||
<text x="17" y="15" fill="#010101" fill-opacity=".3">chat</text>
|
|
||||||
<text x="17" y="14">chat</text>
|
|
||||||
<g transform="scale(0.1) translate(340, -21)">
|
|
||||||
<path class="shadow" d="M263.5,105.5c3.9,1.7,4.2,3,1.1,8.8c-3.1,6-3.9,6.3-7.7,4.8c-4.8-2.1-11-3.6-15-3.6c-6.5,0-10.9,2.3-10.9,5.9
|
|
||||||
c0,11.7,37.4,5.4,37.4,30.4c0,12.6-10.8,21-27,21c-8.5,0-19-2.8-26.3-6.5c-3.6-1.8-3.8-2.9-0.7-8.9c2.7-5.3,3.6-5.8,7.5-4.2
|
|
||||||
c6.2,2.7,14,4.8,19.3,4.8c6,0,9.9-2.4,9.9-6c0-11.4-38.1-6-38.1-30.2c0-12.9,10.7-21.5,26.8-21.5
|
|
||||||
C247.4,100.2,256.9,102.5,263.5,105.5z"/>
|
|
||||||
<path class="shadow" d="M293.7,75.8V169c0,1.4-1.5,2.9-3.6,2.9h-9.8c-2.1,0-3.6-1.5-3.6-2.9V75.8c0-4.6,1.3-5,8.5-5
|
|
||||||
C293.4,70.7,293.7,71.3,293.7,75.8z"/>
|
|
||||||
<path class="shadow" d="M363.4,128.2v40.1c0,2.1-1.5,3.6-3.6,3.6h-9.7c-2.2,0-3.8-1.6-3.6-3.8l0.1-4.3c-5.3,5.8-12.8,8.9-20.3,8.9
|
|
||||||
c-14.6,0-24.4-8.5-24.4-21.1c0-13.4,11.1-22.5,27.7-22.5c6.3,0,12.1,1.1,16.8,3.1v-4.6c0-7.4-5.8-11.8-15.7-11.8
|
|
||||||
c-4.6,0-10.3,1.8-14.8,4.5c-3.5,2-4.3,1.8-8.1-3.8c-3.7-5.6-3.6-6.7,0-9c6.8-4.4,16.1-7.2,24.6-7.2
|
|
||||||
C351.4,100.2,363.4,110.6,363.4,128.2z M318.2,151.4c0,4.8,4,8,10.2,8c7.4,0,14.1-3.6,18-9.6v-6.3c-3.9-1.5-8.7-2.3-12.9-2.3
|
|
||||||
C324.3,141.2,318.2,145.5,318.2,151.4z"/>
|
|
||||||
<path class="shadow" d="M429.9,105.6c3.6,2.1,3.7,3.2-0.2,9.2c-3.7,5.7-4.3,6-8.2,4c-3-1.6-7.7-2.9-11.7-2.9
|
|
||||||
c-12.3,0-20.5,8.1-20.5,20.3c0,12.7,8.2,21.2,20.5,21.2c4.3,0,9.6-1.6,13.1-3.6c3.6-2.1,4.3-1.9,8.1,3.6c3.4,5.1,3.3,6.3,0.3,8.5
|
|
||||||
c-5.5,3.8-14.1,6.7-21.7,6.7c-22.7,0-37.9-14.6-37.9-36.4c0-21.7,15.2-36.1,38.1-36.1C416.6,100.2,424.8,102.6,429.9,105.6z"/>
|
|
||||||
<path class="shadow" d="M504.1,163.1c2.8,3.6,1.7,4.9-5.4,7.5c-7.2,2.6-8.2,2.5-10.8-0.9l-20.3-27.1l-9.1,8.8V169
|
|
||||||
c0,1.4-1.5,2.9-3.6,2.9H445c-2.1,0-3.6-1.5-3.6-2.9V75.8c0-4.6,1.3-5,8.5-5c8.2,0,8.5,0.6,8.5,5v53l27.8-26.7
|
|
||||||
c3.1-2.9,4.8-2.7,10.2,0.9c6,3.9,6.5,5,3.6,7.8L479.3,131L504.1,163.1z"/>
|
|
||||||
</g>
|
|
||||||
<g transform="scale(0.1) translate(340, -21)">
|
|
||||||
<rect x="115.9" y="126.3" transform="matrix(0.9482 -0.3176 0.3176 0.9482 -36.3582 46.5843)" class="shadow" width="17.6" height="17"/>
|
|
||||||
<g>
|
|
||||||
<rect x="115.9" y="126.3" transform="matrix(0.9482 -0.3176 0.3176 0.9482 -36.3582 46.5843)" class="shadow" width="17.6" height="17"/>
|
|
||||||
<path class="shadow" d="M182,117.5c-12.9-43-31.5-53-74.5-40.1s-53,31.5-40.1,74.5s31.5,53,74.5,40.1S194.9,160.5,182,117.5z
|
|
||||||
M160.3,145.4l-8.1,2.7l2.8,8.4c1.1,3.4-0.7,7.1-4.1,8.2c-0.7,0.2-1.5,0.4-2.2,0.3c-2.6-0.1-5.1-1.8-6-4.4l-2.8-8.4l-16.7,5.6
|
|
||||||
l2.8,8.4c1.1,3.4-0.7,7.1-4.1,8.2c-0.7,0.2-1.5,0.4-2.2,0.3c-2.6-0.1-5.1-1.8-6-4.4l-2.8-8.4l-8.1,2.7c-0.7,0.2-1.5,0.4-2.2,0.3
|
|
||||||
c-2.6-0.1-5.1-1.8-6-4.4c-1.1-3.4,0.7-7.1,4.1-8.2l8.1-2.7l-5.4-16.1l-8.1,2.7c-0.7,0.2-1.5,0.4-2.2,0.3c-2.6-0.1-5.1-1.8-6-4.4
|
|
||||||
c-1.1-3.4,0.7-7.1,4.1-8.2l8.1-2.7l-2.8-8.4c-1.1-3.4,0.7-7.1,4.1-8.2s7.1,0.7,8.2,4.1l2.8,8.4l16.7-5.6l-2.8-8.4
|
|
||||||
c-1.1-3.4,0.7-7.1,4.1-8.2s7.1,0.7,8.2,4.1l2.8,8.4l8.1-2.7c3.4-1.1,7.1,0.7,8.2,4.1c1.1,3.4-0.7,7.1-4.1,8.2l-8.1,2.7l5.4,16.1
|
|
||||||
l8.1-2.7c3.4-1.1,7.1,0.7,8.2,4.1C165.5,140.6,163.7,144.3,160.3,145.4z"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
<g transform="scale(0.1) translate(340, -31)">
|
|
||||||
<path class="white" d="M263.5,105.5c3.9,1.7,4.2,3,1.1,8.8c-3.1,6-3.9,6.3-7.7,4.8c-4.8-2.1-11-3.6-15-3.6c-6.5,0-10.9,2.3-10.9,5.9
|
|
||||||
c0,11.7,37.4,5.4,37.4,30.4c0,12.6-10.8,21-27,21c-8.5,0-19-2.8-26.3-6.5c-3.6-1.8-3.8-2.9-0.7-8.9c2.7-5.3,3.6-5.8,7.5-4.2
|
|
||||||
c6.2,2.7,14,4.8,19.3,4.8c6,0,9.9-2.4,9.9-6c0-11.4-38.1-6-38.1-30.2c0-12.9,10.7-21.5,26.8-21.5
|
|
||||||
C247.4,100.2,256.9,102.5,263.5,105.5z"/>
|
|
||||||
<path class="white" d="M293.7,75.8V169c0,1.4-1.5,2.9-3.6,2.9h-9.8c-2.1,0-3.6-1.5-3.6-2.9V75.8c0-4.6,1.3-5,8.5-5
|
|
||||||
C293.4,70.7,293.7,71.3,293.7,75.8z"/>
|
|
||||||
<path class="white" d="M363.4,128.2v40.1c0,2.1-1.5,3.6-3.6,3.6h-9.7c-2.2,0-3.8-1.6-3.6-3.8l0.1-4.3c-5.3,5.8-12.8,8.9-20.3,8.9
|
|
||||||
c-14.6,0-24.4-8.5-24.4-21.1c0-13.4,11.1-22.5,27.7-22.5c6.3,0,12.1,1.1,16.8,3.1v-4.6c0-7.4-5.8-11.8-15.7-11.8
|
|
||||||
c-4.6,0-10.3,1.8-14.8,4.5c-3.5,2-4.3,1.8-8.1-3.8c-3.7-5.6-3.6-6.7,0-9c6.8-4.4,16.1-7.2,24.6-7.2
|
|
||||||
C351.4,100.2,363.4,110.6,363.4,128.2z M318.2,151.4c0,4.8,4,8,10.2,8c7.4,0,14.1-3.6,18-9.6v-6.3c-3.9-1.5-8.7-2.3-12.9-2.3
|
|
||||||
C324.3,141.2,318.2,145.5,318.2,151.4z"/>
|
|
||||||
<path class="white" d="M429.9,105.6c3.6,2.1,3.7,3.2-0.2,9.2c-3.7,5.7-4.3,6-8.2,4c-3-1.6-7.7-2.9-11.7-2.9
|
|
||||||
c-12.3,0-20.5,8.1-20.5,20.3c0,12.7,8.2,21.2,20.5,21.2c4.3,0,9.6-1.6,13.1-3.6c3.6-2.1,4.3-1.9,8.1,3.6c3.4,5.1,3.3,6.3,0.3,8.5
|
|
||||||
c-5.5,3.8-14.1,6.7-21.7,6.7c-22.7,0-37.9-14.6-37.9-36.4c0-21.7,15.2-36.1,38.1-36.1C416.6,100.2,424.8,102.6,429.9,105.6z"/>
|
|
||||||
<path class="white" d="M504.1,163.1c2.8,3.6,1.7,4.9-5.4,7.5c-7.2,2.6-8.2,2.5-10.8-0.9l-20.3-27.1l-9.1,8.8V169
|
|
||||||
c0,1.4-1.5,2.9-3.6,2.9H445c-2.1,0-3.6-1.5-3.6-2.9V75.8c0-4.6,1.3-5,8.5-5c8.2,0,8.5,0.6,8.5,5v53l27.8-26.7
|
|
||||||
c3.1-2.9,4.8-2.7,10.2,0.9c6,3.9,6.5,5,3.6,7.8L479.3,131L504.1,163.1z"/>
|
|
||||||
</g>
|
|
||||||
<g transform="scale(0.1) translate(340, -31)">
|
|
||||||
<rect x="115.9" y="126.3" transform="matrix(0.9482 -0.3176 0.3176 0.9482 -36.3582 46.5843)" class="white" width="17.6" height="17"/>
|
|
||||||
<g>
|
|
||||||
<rect x="115.9" y="126.3" transform="matrix(0.9482 -0.3176 0.3176 0.9482 -36.3582 46.5843)" class="white" width="17.6" height="17"/>
|
|
||||||
<path class="white" d="M182,117.5c-12.9-43-31.5-53-74.5-40.1s-53,31.5-40.1,74.5s31.5,53,74.5,40.1S194.9,160.5,182,117.5z
|
|
||||||
M160.3,145.4l-8.1,2.7l2.8,8.4c1.1,3.4-0.7,7.1-4.1,8.2c-0.7,0.2-1.5,0.4-2.2,0.3c-2.6-0.1-5.1-1.8-6-4.4l-2.8-8.4l-16.7,5.6
|
|
||||||
l2.8,8.4c1.1,3.4-0.7,7.1-4.1,8.2c-0.7,0.2-1.5,0.4-2.2,0.3c-2.6-0.1-5.1-1.8-6-4.4l-2.8-8.4l-8.1,2.7c-0.7,0.2-1.5,0.4-2.2,0.3
|
|
||||||
c-2.6-0.1-5.1-1.8-6-4.4c-1.1-3.4,0.7-7.1,4.1-8.2l8.1-2.7l-5.4-16.1l-8.1,2.7c-0.7,0.2-1.5,0.4-2.2,0.3c-2.6-0.1-5.1-1.8-6-4.4
|
|
||||||
c-1.1-3.4,0.7-7.1,4.1-8.2l8.1-2.7l-2.8-8.4c-1.1-3.4,0.7-7.1,4.1-8.2s7.1,0.7,8.2,4.1l2.8,8.4l16.7-5.6l-2.8-8.4
|
|
||||||
c-1.1-3.4,0.7-7.1,4.1-8.2s7.1,0.7,8.2,4.1l2.8,8.4l8.1-2.7c3.4-1.1,7.1,0.7,8.2,4.1c1.1,3.4-0.7,7.1-4.1,8.2l-8.1,2.7l5.4,16.1
|
|
||||||
l8.1-2.7c3.4-1.1,7.1,0.7,8.2,4.1C165.5,140.6,163.7,144.3,160.3,145.4z"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 7.1 KiB |
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 93 93" xml:space="preserve">
|
|
||||||
<g>
|
|
||||||
<path fill="#F05133" d="M90,41.8L49.9,1.7c-2.3-2.3-6.1-2.3-8.4,0L33.2,10l10.6,10.6c2.5-0.8,5.3-0.3,7.2,1.7c2,2,2.5,4.8,1.7,7.3
|
|
||||||
l10.2,10.2c2.5-0.8,5.3-0.3,7.3,1.7c2.8,2.7,2.8,7.2,0,10s-7.2,2.8-10,0c-2.1-2.1-2.6-5.1-1.5-7.7l-9.5-9.5v25
|
|
||||||
c0.7,0.3,1.3,0.8,1.9,1.3c2.8,2.7,2.8,7.2,0,10c-2.8,2.7-7.2,2.7-10,0c-2.8-2.8-2.8-7.2,0-10c0.7-0.7,1.5-1.2,2.3-1.5V33.8
|
|
||||||
c-0.8-0.3-1.6-0.9-2.3-1.5c-2.1-2.1-2.6-5.1-1.5-7.7L29.2,14.2L1.7,41.7c-2.3,2.3-2.3,6.1,0,8.4l40.1,40.1c2.3,2.3,6.1,2.3,8.4,0
|
|
||||||
l39.9-39.9C92.4,47.9,92.4,44.1,90,41.8z"/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 795 B |
@@ -1,12 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 93 93" xml:space="preserve">
|
|
||||||
<g>
|
|
||||||
<path fill="#FFFFFF" fill-opacity="0.74" d="M90,41.8L49.9,1.7c-2.3-2.3-6.1-2.3-8.4,0L33.2,10l10.6,10.6c2.5-0.8,5.3-0.3,7.2,1.7c2,2,2.5,4.8,1.7,7.3
|
|
||||||
l10.2,10.2c2.5-0.8,5.3-0.3,7.3,1.7c2.8,2.7,2.8,7.2,0,10s-7.2,2.8-10,0c-2.1-2.1-2.6-5.1-1.5-7.7l-9.5-9.5v25
|
|
||||||
c0.7,0.3,1.3,0.8,1.9,1.3c2.8,2.7,2.8,7.2,0,10c-2.8,2.7-7.2,2.7-10,0c-2.8-2.8-2.8-7.2,0-10c0.7-0.7,1.5-1.2,2.3-1.5V33.8
|
|
||||||
c-0.8-0.3-1.6-0.9-2.3-1.5c-2.1-2.1-2.6-5.1-1.5-7.7L29.2,14.2L1.7,41.7c-2.3,2.3-2.3,6.1,0,8.4l40.1,40.1c2.3,2.3,6.1,2.3,8.4,0
|
|
||||||
l39.9-39.9C92.4,47.9,92.4,44.1,90,41.8z">
|
|
||||||
<animate attributeName="fill" values="#FFFFFF;#F05133;#FFFFFF" dur="1s" repeatCount="indefinite"/>
|
|
||||||
</path>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 941 B |
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#C5C5C5" x="6.5" y="5.5" width="3" height="11"/>
|
|
||||||
<rect fill="#C5C5C5" x="2.5" y="9.5" width="11" height="3"/>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 253 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m13,8c0,-1.11 -0.89,-2 -2,-2c-1.11,0 -2,0.89 -2,2c0,0.73 0.41,1.38 1,1.72l0,0.3c-0.02,0.52 -0.23,0.98 -0.63,1.38c-0.4,0.4 -0.86,0.61 -1.38,0.63c-0.83,0.02 -1.48,0.16 -2,0.45l0,-4.76c0.59,-0.34 1,-0.98 1,-1.72c0,-1.11 -0.89,-2 -2,-2c-1.11,0 -1.99,0.89 -1.99,2c0,0.73 0.41,1.38 1,1.72l0,6.56c-0.59,0.35 -1,0.99 -1,1.72c0,1.11 0.89,2 2,2c1.11,0 2,-0.89 2,-2c0,-0.53 -0.2,-1 -0.53,-1.36c0.09,-0.06 0.48,-0.41 0.59,-0.47c0.25,-0.11 0.56,-0.17 0.94,-0.17c1.05,-0.05 1.95,-0.45 2.75,-1.25c0.8,-0.8 1.2,-1.98 1.25,-3.02l-0.02,0c0.61,-0.36 1.02,-1 1.02,-1.73l0,0zm-8,-3.2c0.66,0 1.2,0.55 1.2,1.2c0,0.65 -0.55,1.2 -1.2,1.2c-0.65,0 -1.2,-0.55 -1.2,-1.2c0,-0.65 0.55,-1.2 1.2,-1.2l0,0zm0,12.41c-0.66,0 -1.2,-0.55 -1.2,-1.2c0,-0.65 0.55,-1.2 1.2,-1.2c0.65,0 1.2,0.55 1.2,1.2c0,0.65 -0.55,1.2 -1.2,1.2l0,0zm6,-8c-0.66,0 -1.2,-0.55 -1.2,-1.2c0,-0.65 0.55,-1.2 1.2,-1.2c0.65,0 1.2,0.55 1.2,1.2c0,0.65 -0.55,1.2 -1.2,1.2l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.0 KiB |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m11.86,10c-0.45,-1.72 -2,-3 -3.86,-3c-1.86,0 -3.41,1.28 -3.86,3l-3.14,0l0,2l3.14,0c0.45,1.72 2,3 3.86,3c1.86,0 3.41,-1.28 3.86,-3l3.14,0l0,-2l-3.14,0zm-3.86,3.2c-1.22,0 -2.2,-0.98 -2.2,-2.2c0,-1.22 0.98,-2.2 2.2,-2.2c1.22,0 2.2,0.98 2.2,2.2c0,1.22 -0.98,2.2 -2.2,2.2z"></path>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 428 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m9,15l2,0l-3,3l-3,-3l2,0l0,-5l2,0l0,5l0,0zm3,-8c0,-0.44 -0.91,-3 -4.5,-3c-2.42,0 -4.5,1.92 -4.5,4c-1.98,0 -3,1.52 -3,3c0,1.53 1,3 3,3l3,0l0,-1.3l-3,0c-1.62,0 -1.7,-1.42 -1.7,-1.7c0,-0.17 0.05,-1.7 1.7,-1.7l1.3,0l0,-1.3c0,-1.39 1.56,-2.7 3.2,-2.7c2.55,0 3.13,1.55 3.2,1.8l0,1.2l1.3,0c0.81,0 2.7,0.22 2.7,2.2c0,2.09 -2.25,2.2 -2.7,2.2l-2,0l0,1.3l2,0c2.08,0 4,-1.16 4,-3.5c0,-2.44 -1.92,-3.5 -4,-3.5l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 557 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m9,16l-2,0l0,-7l5,0l0,2l-3,0l0,5l0,0zm-1,-12c-2.19,0 -4.13,1.02 -5.41,2.59l-1.59,-1.59l0,4l4,0l-1.5,-1.5c1.05,-1.33 2.67,-2.2 4.5,-2.2c3.14,0 5.7,2.56 5.7,5.7c0,3.14 -2.56,5.7 -5.7,5.7c-3.14,0 -5.7,-2.56 -5.7,-5.7c0,-0.34 0.03,-0.67 0.09,-1l-1.31,0c-0.05,0.33 -0.08,0.66 -0.08,1c0,3.86 3.14,7 7,7c3.86,0 7,-3.14 7,-7c0,-3.86 -3.14,-7 -7,-7l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 500 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m12.901149,9.091851l-0.094,0.071c-0.269,0.333 -0.746,1.096 -0.91,2.375c0.057,0.277 0.092,0.495 0.092,0.545c0,2.206 -1.794,4 -4,4a3.986,3.986 0 0 1 -2.817,-1.164a3.987,3.987 0 0 1 -1.163,-2.815c0,-2.206 1.794,-4 4,-4l0.351,0.025l0,1.85s1.626,-1.342 1.631,-1.339l1.869,-1.577l-3.5,-2.917l0,2.218l-0.371,-0.03a5.75,5.75 0 0 0 -4.055,9.826a5.75,5.75 0 0 0 9.826,-4.056a5.725,5.725 0 0 0 -0.859,-3.012z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 553 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m12.519592,15.157073l-9.039184,0c-1.367793,0 -2.480539,-1.112828 -2.480539,-2.480622s1.112746,-2.480539 2.480539,-2.480539l0.281314,0c0.349178,-0.47173 0.888523,-0.771191 1.476341,-0.815025c0.321917,-1.471535 1.619609,-2.537962 3.165139,-2.537962c1.221543,0 2.341663,0.699516 2.889377,1.772488c0.083027,-0.008618 0.166386,-0.012926 0.250076,-0.012926c1.190221,0 2.194667,0.874105 2.378785,2.027867c0.670514,0.460047 1.07869,1.225023 1.07869,2.046096c0,1.367793 -1.112828,2.480622 -2.480539,2.480622z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 655 B |
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
|
|
||||||
<ellipse fill="#32cd32" stroke="#C5C5C5" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 586 B |
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
|
|
||||||
<ellipse fill="#cd3131" stroke="#C5C5C5" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 586 B |
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
|
|
||||||
<ellipse fill="#cdcd32" stroke="#C5C5C5" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 586 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 490 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m14.414133,16.199437l-3.415492,-3.433421c0.627518,-0.878526 0.995065,-1.945307 0.995065,-3.110698c0,-2.967265 -2.411463,-5.378728 -5.378728,-5.378728c-2.967265,0 -5.378728,2.411463 -5.378728,5.378728c0,2.967265 2.411463,5.378728 5.378728,5.378728c1.165391,0 2.223207,-0.367546 3.110698,-0.995065l3.433421,3.415492c0.170326,0.179291 0.403405,0.268936 0.627518,0.268936c0.224114,0 0.466156,-0.080681 0.627518,-0.268936c0.349617,-0.349617 0.349617,-0.914384 0,-1.264001l0,0.008965zm-7.799155,-2.330782c-2.321817,0 -4.213337,-1.891519 -4.213337,-4.213337c0,-2.321817 1.891519,-4.213337 4.213337,-4.213337c2.321817,0 4.213337,1.891519 4.213337,4.213337c0,2.321817 -1.891519,4.213337 -4.213337,4.213337l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 857 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m14.687501,11.955358l-1.079554,-6.821251c-0.076429,-0.458572 -0.477679,-0.821607 -0.955357,-0.821607l-9.30518,0c-0.477679,0 -0.878929,0.363036 -0.955357,0.821607l-1.079554,6.821251l0,4.776787c0,0.525447 0.429911,0.955357 0.955357,0.955357l11.464288,0c0.525447,0 0.955357,-0.429911 0.955357,-0.955357l0,-4.776787l0,0zm-3.133572,0.525447l-0.420357,0.850268c-0.162411,0.324821 -0.496786,0.535 -0.869375,0.535l-4.547501,0c-0.363036,0 -0.687857,-0.210179 -0.850268,-0.525447l-0.420357,-0.869375c-0.162411,-0.315268 -0.496786,-0.525447 -0.850268,-0.525447l-1.327947,0l0.955357,-6.687501l9.553573,0l0.955357,6.687501l-1.318393,0c-0.372589,0 -0.697411,0.210179 -0.869375,0.525447l0.009554,0.009554z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 846 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#3c8746" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
A
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#7F4E7E" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
!
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#692C77" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
C
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#9E121D" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
D
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#969696" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
I
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#1B80B2" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
M
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#CC6633" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
R
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#6C6C6C" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
?
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#6C6C6C" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
U
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m12.24,10.4c0.19,1.28 -0.2,2.62 -1.2,3.6c-1.47,1.45 -3.74,1.63 -5.41,0.54l1.17,-1.14l-4.3,-0.6l0.6,4.2l1.31,-1.26c2.36,1.74 5.7,1.57 7.84,-0.54c1.24,-1.23 1.81,-2.85 1.74,-4.46l-1.75,-0.34l0,0zm-7.28,-2.4c1.47,-1.45 3.74,-1.63 5.41,-0.54l-1.17,1.14l4.3,0.6l-0.6,-4.2l-1.31,1.26c-2.36,-1.74 -5.7,-1.57 -7.85,0.54c-1.24,1.23 -1.8,2.85 -1.73,4.46l1.75,0.35c-0.19,-1.28 0.2,-2.63 1.2,-3.61l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 546 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m12.5,11l2.5,2.5c0,0.55 -0.45,1 -1,1l-4,0l0,-1l3.5,0l-2,-2l-7,0l-2,2l3.5,0l0,1l-4,0c-0.55,0 -1,-0.45 -1,-1l2.5,-2.5l-2.5,-2.5c0,-0.55 0.45,-1 1,-1l4,0l0,1l-3.5,0l2,2l7,0l2,-2l-3.5,0l0,-1l4,0c0.55,0 1,0.45 1,1l-2.5,2.5l0,0zm-5.5,-1.5l2,0l0,-3l2,0l-3,-3l-3,3l2,0l0,3l0,0zm2,3l-2,0l0,3l-2,0l3,3l3,-3l-2,0l0,-3l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 467 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#C5C5C5" d="m7,12l-2,0l3,-3l3,3l-2,0l0,5l-2,0l0,-5l0,0zm5,-4c0,-0.44 -0.91,-3 -4.5,-3c-2.42,0 -4.5,1.92 -4.5,4c-1.98,0 -3,1.52 -3,3c0,1.53 1,3 3,3l3,0l0,-1.3l-3,0c-1.62,0 -1.7,-1.42 -1.7,-1.7c0,-0.17 0.05,-1.7 1.7,-1.7l1.3,0l0,-1.3c0,-1.39 1.56,-2.7 3.2,-2.7c2.55,0 3.13,1.55 3.2,1.8l0,1.2l1.3,0c0.81,0 2.7,0.22 2.7,2.2c0,2.09 -2.25,2.2 -2.7,2.2l-2,0l0,1.3l2,0c2.08,0 4,-1.16 4,-3.5c0,-2.44 -1.92,-3.5 -4,-3.5l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 558 B |
|
Before Width: | Height: | Size: 815 B After Width: | Height: | Size: 815 B |
|
Before Width: | Height: | Size: 814 B After Width: | Height: | Size: 814 B |
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.2 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 MiB |
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 93 93" xml:space="preserve">
|
|
||||||
<g>
|
|
||||||
<path fill="#F05133" d="M90,41.8L49.9,1.7c-2.3-2.3-6.1-2.3-8.4,0L33.2,10l10.6,10.6c2.5-0.8,5.3-0.3,7.2,1.7c2,2,2.5,4.8,1.7,7.3
|
|
||||||
l10.2,10.2c2.5-0.8,5.3-0.3,7.3,1.7c2.8,2.7,2.8,7.2,0,10s-7.2,2.8-10,0c-2.1-2.1-2.6-5.1-1.5-7.7l-9.5-9.5v25
|
|
||||||
c0.7,0.3,1.3,0.8,1.9,1.3c2.8,2.7,2.8,7.2,0,10c-2.8,2.7-7.2,2.7-10,0c-2.8-2.8-2.8-7.2,0-10c0.7-0.7,1.5-1.2,2.3-1.5V33.8
|
|
||||||
c-0.8-0.3-1.6-0.9-2.3-1.5c-2.1-2.1-2.6-5.1-1.5-7.7L29.2,14.2L1.7,41.7c-2.3,2.3-2.3,6.1,0,8.4l40.1,40.1c2.3,2.3,6.1,2.3,8.4,0
|
|
||||||
l39.9-39.9C92.4,47.9,92.4,44.1,90,41.8z"/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 795 B |
@@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 93 93" xml:space="preserve">
|
|
||||||
<g>
|
|
||||||
<path fill="#000000" fill-opacity="0.6" d="M90,41.8L49.9,1.7c-2.3-2.3-6.1-2.3-8.4,0L33.2,10l10.6,10.6c2.5-0.8,5.3-0.3,7.2,1.7c2,2,2.5,4.8,1.7,7.3
|
|
||||||
l10.2,10.2c2.5-0.8,5.3-0.3,7.3,1.7c2.8,2.7,2.8,7.2,0,10s-7.2,2.8-10,0c-2.1-2.1-2.6-5.1-1.5-7.7l-9.5-9.5v25
|
|
||||||
c0.7,0.3,1.3,0.8,1.9,1.3c2.8,2.7,2.8,7.2,0,10c-2.8,2.7-7.2,2.7-10,0c-2.8-2.8-2.8-7.2,0-10c0.7-0.7,1.5-1.2,2.3-1.5V33.8
|
|
||||||
c-0.8-0.3-1.6-0.9-2.3-1.5c-2.1-2.1-2.6-5.1-1.5-7.7L29.2,14.2L1.7,41.7c-2.3,2.3-2.3,6.1,0,8.4l40.1,40.1c2.3,2.3,6.1,2.3,8.4,0
|
|
||||||
l39.9-39.9C92.4,47.9,92.4,44.1,90,41.8z">
|
|
||||||
<animate attributeName="fill" values="#000000;#F05133;#000000" dur="1s" repeatCount="indefinite"/>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 941 B |
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#424242" x="6.5" y="5.5" width="3" height="11"/>
|
|
||||||
<rect fill="#424242" x="2.5" y="9.5" width="11" height="3"/>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 253 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m13,8c0,-1.11 -0.89,-2 -2,-2c-1.11,0 -2,0.89 -2,2c0,0.73 0.41,1.38 1,1.72l0,0.3c-0.02,0.52 -0.23,0.98 -0.63,1.38c-0.4,0.4 -0.86,0.61 -1.38,0.63c-0.83,0.02 -1.48,0.16 -2,0.45l0,-4.76c0.59,-0.34 1,-0.98 1,-1.72c0,-1.11 -0.89,-2 -2,-2c-1.11,0 -1.99,0.89 -1.99,2c0,0.73 0.41,1.38 1,1.72l0,6.56c-0.59,0.35 -1,0.99 -1,1.72c0,1.11 0.89,2 2,2c1.11,0 2,-0.89 2,-2c0,-0.53 -0.2,-1 -0.53,-1.36c0.09,-0.06 0.48,-0.41 0.59,-0.47c0.25,-0.11 0.56,-0.17 0.94,-0.17c1.05,-0.05 1.95,-0.45 2.75,-1.25c0.8,-0.8 1.2,-1.98 1.25,-3.02l-0.02,0c0.61,-0.36 1.02,-1 1.02,-1.73l0,0zm-8,-3.2c0.66,0 1.2,0.55 1.2,1.2c0,0.65 -0.55,1.2 -1.2,1.2c-0.65,0 -1.2,-0.55 -1.2,-1.2c0,-0.65 0.55,-1.2 1.2,-1.2l0,0zm0,12.41c-0.66,0 -1.2,-0.55 -1.2,-1.2c0,-0.65 0.55,-1.2 1.2,-1.2c0.65,0 1.2,0.55 1.2,1.2c0,0.65 -0.55,1.2 -1.2,1.2l0,0zm6,-8c-0.66,0 -1.2,-0.55 -1.2,-1.2c0,-0.65 0.55,-1.2 1.2,-1.2c0.65,0 1.2,0.55 1.2,1.2c0,0.65 -0.55,1.2 -1.2,1.2l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.0 KiB |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m11.86,10c-0.45,-1.72 -2,-3 -3.86,-3c-1.86,0 -3.41,1.28 -3.86,3l-3.14,0l0,2l3.14,0c0.45,1.72 2,3 3.86,3c1.86,0 3.41,-1.28 3.86,-3l3.14,0l0,-2l-3.14,0zm-3.86,3.2c-1.22,0 -2.2,-0.98 -2.2,-2.2c0,-1.22 0.98,-2.2 2.2,-2.2c1.22,0 2.2,0.98 2.2,2.2c0,1.22 -0.98,2.2 -2.2,2.2z"></path>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 428 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m9,15l2,0l-3,3l-3,-3l2,0l0,-5l2,0l0,5l0,0zm3,-8c0,-0.44 -0.91,-3 -4.5,-3c-2.42,0 -4.5,1.92 -4.5,4c-1.98,0 -3,1.52 -3,3c0,1.53 1,3 3,3l3,0l0,-1.3l-3,0c-1.62,0 -1.7,-1.42 -1.7,-1.7c0,-0.17 0.05,-1.7 1.7,-1.7l1.3,0l0,-1.3c0,-1.39 1.56,-2.7 3.2,-2.7c2.55,0 3.13,1.55 3.2,1.8l0,1.2l1.3,0c0.81,0 2.7,0.22 2.7,2.2c0,2.09 -2.25,2.2 -2.7,2.2l-2,0l0,1.3l2,0c2.08,0 4,-1.16 4,-3.5c0,-2.44 -1.92,-3.5 -4,-3.5l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 557 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m9,16l-2,0l0,-7l5,0l0,2l-3,0l0,5l0,0zm-1,-12c-2.19,0 -4.13,1.02 -5.41,2.59l-1.59,-1.59l0,4l4,0l-1.5,-1.5c1.05,-1.33 2.67,-2.2 4.5,-2.2c3.14,0 5.7,2.56 5.7,5.7c0,3.14 -2.56,5.7 -5.7,5.7c-3.14,0 -5.7,-2.56 -5.7,-5.7c0,-0.34 0.03,-0.67 0.09,-1l-1.31,0c-0.05,0.33 -0.08,0.66 -0.08,1c0,3.86 3.14,7 7,7c3.86,0 7,-3.14 7,-7c0,-3.86 -3.14,-7 -7,-7l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 500 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m12.901149,9.091851l-0.094,0.071c-0.269,0.333 -0.746,1.096 -0.91,2.375c0.057,0.277 0.092,0.495 0.092,0.545c0,2.206 -1.794,4 -4,4a3.986,3.986 0 0 1 -2.817,-1.164a3.987,3.987 0 0 1 -1.163,-2.815c0,-2.206 1.794,-4 4,-4l0.351,0.025l0,1.85s1.626,-1.342 1.631,-1.339l1.869,-1.577l-3.5,-2.917l0,2.218l-0.371,-0.03a5.75,5.75 0 0 0 -4.055,9.826a5.75,5.75 0 0 0 9.826,-4.056a5.725,5.725 0 0 0 -0.859,-3.012z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 553 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m12.519592,15.157073l-9.039184,0c-1.367793,0 -2.480539,-1.112828 -2.480539,-2.480622s1.112746,-2.480539 2.480539,-2.480539l0.281314,0c0.349178,-0.47173 0.888523,-0.771191 1.476341,-0.815025c0.321917,-1.471535 1.619609,-2.537962 3.165139,-2.537962c1.221543,0 2.341663,0.699516 2.889377,1.772488c0.083027,-0.008618 0.166386,-0.012926 0.250076,-0.012926c1.190221,0 2.194667,0.874105 2.378785,2.027867c0.670514,0.460047 1.07869,1.225023 1.07869,2.046096c0,1.367793 -1.112828,2.480622 -2.480539,2.480622z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 655 B |
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
|
|
||||||
<ellipse fill="#32cd32" stroke="#424242" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 586 B |
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
|
|
||||||
<ellipse fill="#cd3131" stroke="#424242" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 586 B |
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
|
|
||||||
<ellipse fill="#cdcd32" stroke="#424242" stroke-width="0.5" rx="3" ry="3" cx="13" cy="4" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 586 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m6,12l-1,0l0,-1l1,0l0,1l0,0zm0,-3l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm0,-2l-1,0l0,1l1,0l0,-1l0,0zm8,-1l0,12c0,0.55 -0.45,1 -1,1l-5,0l0,2l-1.5,-1.5l-1.5,1.5l0,-2l-2,0c-0.55,0 -1,-0.45 -1,-1l0,-12c0,-0.55 0.45,-1 1,-1l10,0c0.55,0 1,0.45 1,1l0,0zm-1,10l-10,0l0,2l2,0l0,-1l3,0l0,1l5,0l0,-2l0,0zm0,-10l-9,0l0,9l9,0l0,-9l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 490 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m14.414133,16.199437l-3.415492,-3.433421c0.627518,-0.878526 0.995065,-1.945307 0.995065,-3.110698c0,-2.967265 -2.411463,-5.378728 -5.378728,-5.378728c-2.967265,0 -5.378728,2.411463 -5.378728,5.378728c0,2.967265 2.411463,5.378728 5.378728,5.378728c1.165391,0 2.223207,-0.367546 3.110698,-0.995065l3.433421,3.415492c0.170326,0.179291 0.403405,0.268936 0.627518,0.268936c0.224114,0 0.466156,-0.080681 0.627518,-0.268936c0.349617,-0.349617 0.349617,-0.914384 0,-1.264001l0,0.008965zm-7.799155,-2.330782c-2.321817,0 -4.213337,-1.891519 -4.213337,-4.213337c0,-2.321817 1.891519,-4.213337 4.213337,-4.213337c2.321817,0 4.213337,1.891519 4.213337,4.213337c0,2.321817 -1.891519,4.213337 -4.213337,4.213337l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 857 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m14.687501,11.955358l-1.079554,-6.821251c-0.076429,-0.458572 -0.477679,-0.821607 -0.955357,-0.821607l-9.30518,0c-0.477679,0 -0.878929,0.363036 -0.955357,0.821607l-1.079554,6.821251l0,4.776787c0,0.525447 0.429911,0.955357 0.955357,0.955357l11.464288,0c0.525447,0 0.955357,-0.429911 0.955357,-0.955357l0,-4.776787l0,0zm-3.133572,0.525447l-0.420357,0.850268c-0.162411,0.324821 -0.496786,0.535 -0.869375,0.535l-4.547501,0c-0.363036,0 -0.687857,-0.210179 -0.850268,-0.525447l-0.420357,-0.869375c-0.162411,-0.315268 -0.496786,-0.525447 -0.850268,-0.525447l-1.327947,0l0.955357,-6.687501l9.553573,0l0.955357,6.687501l-1.318393,0c-0.372589,0 -0.697411,0.210179 -0.869375,0.525447l0.009554,0.009554z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 846 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#2d883e" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
A
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#9B4F96" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
!
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#682079" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
C
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#B9131A" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
D
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#969696" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
I
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#007ACC" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
M
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#CC6633" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
R
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#6C6C6C" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
?
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,6 +0,0 @@
|
|||||||
<svg width="14px" height="14px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<rect fill="#6C6C6C" x="0" y="0" width="100" height="100" rx="35" ry="35"/>
|
|
||||||
<text x="50" y="75" font-size="75" text-anchor="middle" style="font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";" fill="white">
|
|
||||||
U
|
|
||||||
</text>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 431 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m12.24,10.4c0.19,1.28 -0.2,2.62 -1.2,3.6c-1.47,1.45 -3.74,1.63 -5.41,0.54l1.17,-1.14l-4.3,-0.6l0.6,4.2l1.31,-1.26c2.36,1.74 5.7,1.57 7.84,-0.54c1.24,-1.23 1.81,-2.85 1.74,-4.46l-1.75,-0.34l0,0zm-7.28,-2.4c1.47,-1.45 3.74,-1.63 5.41,-0.54l-1.17,1.14l4.3,0.6l-0.6,-4.2l-1.31,1.26c-2.36,-1.74 -5.7,-1.57 -7.85,0.54c-1.24,1.23 -1.8,2.85 -1.73,4.46l1.75,0.35c-0.19,-1.28 0.2,-2.63 1.2,-3.61l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 546 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m12.5,11l2.5,2.5c0,0.55 -0.45,1 -1,1l-4,0l0,-1l3.5,0l-2,-2l-7,0l-2,2l3.5,0l0,1l-4,0c-0.55,0 -1,-0.45 -1,-1l2.5,-2.5l-2.5,-2.5c0,-0.55 0.45,-1 1,-1l4,0l0,1l-3.5,0l2,2l7,0l2,-2l-3.5,0l0,-1l4,0c0.55,0 1,0.45 1,1l-2.5,2.5l0,0zm-5.5,-1.5l2,0l0,-3l2,0l-3,-3l-3,3l2,0l0,3l0,0zm2,3l-2,0l0,3l-2,0l3,3l3,-3l-2,0l0,-3l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 467 B |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<svg width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path fill="#424242" d="m7,12l-2,0l3,-3l3,3l-2,0l0,5l-2,0l0,-5l0,0zm5,-4c0,-0.44 -0.91,-3 -4.5,-3c-2.42,0 -4.5,1.92 -4.5,4c-1.98,0 -3,1.52 -3,3c0,1.53 1,3 3,3l3,0l0,-1.3l-3,0c-1.62,0 -1.7,-1.42 -1.7,-1.7c0,-0.17 0.05,-1.7 1.7,-1.7l1.3,0l0,-1.3c0,-1.39 1.56,-2.7 3.2,-2.7c2.55,0 3.13,1.55 3.2,1.8l0,1.2l1.3,0c0.81,0 2.7,0.22 2.7,2.2c0,2.09 -2.25,2.2 -2.7,2.2l-2,0l0,1.3l2,0c2.08,0 4,-1.16 4,-3.5c0,-2.44 -1.92,-3.5 -4,-3.5l0,0z" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 558 B |
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 98 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 67 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 75 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 57 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 25 KiB |
1379
package-lock.json
generated
1379
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
792
package.json
792
package.json
File diff suppressed because it is too large
Load Diff
14
src/@types/applicationinsights/index.d.ts
vendored
14
src/@types/applicationinsights/index.d.ts
vendored
@@ -16,9 +16,9 @@ interface AutoCollectConsole {
|
|||||||
}
|
}
|
||||||
|
|
||||||
interface AutoCollectExceptions {
|
interface AutoCollectExceptions {
|
||||||
constructor(client: Client): AutoCollectExceptions;
|
constructor(client:Client): AutoCollectExceptions;
|
||||||
isInitialized(): boolean;
|
isInitialized(): boolean;
|
||||||
enable(isEnabled: boolean): void;
|
enable(isEnabled:boolean): void;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface AutoCollectPerformance {
|
interface AutoCollectPerformance {
|
||||||
@@ -348,7 +348,7 @@ interface Client {
|
|||||||
* @param max the max sample for this set
|
* @param max the max sample for this set
|
||||||
* @param stdDev the standard deviation of the set
|
* @param stdDev the standard deviation of the set
|
||||||
*/
|
*/
|
||||||
trackMetric(name: string, value: number, count?: number, min?: number, max?: number, stdDev?: number, properties?: {
|
trackMetric(name: string, value: number, count?:number, min?: number, max?: number, stdDev?: number, properties?: {
|
||||||
[key: string]: string;
|
[key: string]: string;
|
||||||
}): void;
|
}): void;
|
||||||
|
|
||||||
@@ -374,8 +374,7 @@ interface Client {
|
|||||||
* @param error An error that was returned for this request if it was unsuccessful. Defaults to null.
|
* @param error An error that was returned for this request if it was unsuccessful. Defaults to null.
|
||||||
*/
|
*/
|
||||||
trackRequestSync(request: any /*http.IncomingMessage */, response: any /*http.ServerResponse */, ellapsedMilliseconds?: number, properties?: {
|
trackRequestSync(request: any /*http.IncomingMessage */, response: any /*http.ServerResponse */, ellapsedMilliseconds?: number, properties?: {
|
||||||
[key: string]: string;
|
[key: string]: string;}, error?: any) : void;
|
||||||
}, error?: any): void;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Log information about a dependency of your app. Typically used to track the time database calls or outgoing http requests take from your server.
|
* Log information about a dependency of your app. Typically used to track the time database calls or outgoing http requests take from your server.
|
||||||
@@ -504,11 +503,6 @@ interface ApplicationInsights {
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
setOfflineMode(value: boolean, resentIntervall?: number): ApplicationInsights;
|
setOfflineMode(value: boolean, resentIntervall?: number): ApplicationInsights;
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
setAutoDependencyCorrelation(value: boolean): ApplicationInsights;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
declare module "applicationinsights" {
|
declare module "applicationinsights" {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
import { Functions } from './system';
|
|
||||||
import { commands, Disposable, TextEditor, window } from 'vscode';
|
import { commands, Disposable, TextEditor, window } from 'vscode';
|
||||||
import { BuiltInCommands } from './constants';
|
import { BuiltInCommands } from './constants';
|
||||||
|
|
||||||
@@ -12,20 +11,19 @@ export class ActiveEditorTracker extends Disposable {
|
|||||||
constructor() {
|
constructor() {
|
||||||
super(() => this.dispose());
|
super(() => this.dispose());
|
||||||
|
|
||||||
const fn = Functions.debounce((e: TextEditor) => this._resolver && this._resolver(e), 50);
|
this._disposable = window.onDidChangeActiveTextEditor(e => this._resolver && this._resolver(e));
|
||||||
this._disposable = window.onDidChangeActiveTextEditor(fn);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dispose() {
|
dispose() {
|
||||||
this._disposable && this._disposable.dispose();
|
this._disposable && this._disposable.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
async awaitClose(timeout: number = 500): Promise<TextEditor | undefined> {
|
async awaitClose(timeout: number = 500): Promise<TextEditor> {
|
||||||
this.close();
|
this.close();
|
||||||
return this.wait(timeout);
|
return this.wait(timeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
async awaitNext(timeout: number = 500): Promise<TextEditor | undefined> {
|
async awaitNext(timeout: number = 500): Promise<TextEditor> {
|
||||||
this.next();
|
this.next();
|
||||||
return this.wait(timeout);
|
return this.wait(timeout);
|
||||||
}
|
}
|
||||||
@@ -38,15 +36,15 @@ export class ActiveEditorTracker extends Disposable {
|
|||||||
return commands.executeCommand(BuiltInCommands.NextEditor);
|
return commands.executeCommand(BuiltInCommands.NextEditor);
|
||||||
}
|
}
|
||||||
|
|
||||||
async wait(timeout: number = 500): Promise<TextEditor | undefined> {
|
async wait(timeout: number = 500): Promise<TextEditor> {
|
||||||
const editor = await new Promise<TextEditor>((resolve, reject) => {
|
const editor = await new Promise<TextEditor>((resolve, reject) => {
|
||||||
let timer: any;
|
let timer: any;
|
||||||
|
|
||||||
this._resolver = (e: TextEditor) => {
|
this._resolver = (editor: TextEditor) => {
|
||||||
if (timer) {
|
if (timer) {
|
||||||
clearTimeout(timer as any);
|
clearTimeout(timer as any);
|
||||||
timer = 0;
|
timer = 0;
|
||||||
resolve(e);
|
resolve(editor);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -55,7 +53,6 @@ export class ActiveEditorTracker extends Disposable {
|
|||||||
timer = 0;
|
timer = 0;
|
||||||
}, timeout) as any;
|
}, timeout) as any;
|
||||||
});
|
});
|
||||||
|
|
||||||
this._resolver = undefined;
|
this._resolver = undefined;
|
||||||
return editor;
|
return editor;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,34 +1,21 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { Functions, Objects } from '../system';
|
import { Functions, Objects } from '../system';
|
||||||
import { DecorationRenderOptions, Disposable, Event, EventEmitter, ExtensionContext, OverviewRulerLane, Progress, ProgressLocation, TextDocument, TextDocumentChangeEvent, TextEditor, TextEditorDecorationType, TextEditorViewColumnChangeEvent, window, workspace } from 'vscode';
|
import { DecorationRenderOptions, Disposable, Event, EventEmitter, ExtensionContext, OverviewRulerLane, TextDocument, TextDocumentChangeEvent, TextEditor, TextEditorDecorationType, TextEditorViewColumnChangeEvent, window, workspace } from 'vscode';
|
||||||
import { AnnotationProviderBase } from './annotationProvider';
|
import { AnnotationProviderBase } from './annotationProvider';
|
||||||
import { Keyboard, KeyboardScope, KeyCommand, Keys } from '../keyboard';
|
|
||||||
import { TextDocumentComparer, TextEditorComparer } from '../comparers';
|
import { TextDocumentComparer, TextEditorComparer } from '../comparers';
|
||||||
import { ExtensionKey, IConfig, LineHighlightLocations, themeDefaults } from '../configuration';
|
import { BlameLineHighlightLocations, ExtensionKey, FileAnnotationType, IConfig, themeDefaults } from '../configuration';
|
||||||
import { CommandContext, setCommandContext } from '../constants';
|
|
||||||
import { BlameabilityChangeEvent, GitContextTracker, GitService, GitUri } from '../gitService';
|
import { BlameabilityChangeEvent, GitContextTracker, GitService, GitUri } from '../gitService';
|
||||||
import { GutterBlameAnnotationProvider } from './gutterBlameAnnotationProvider';
|
import { GutterBlameAnnotationProvider } from './gutterBlameAnnotationProvider';
|
||||||
import { HoverBlameAnnotationProvider } from './hoverBlameAnnotationProvider';
|
import { HoverBlameAnnotationProvider } from './hoverBlameAnnotationProvider';
|
||||||
import { Logger } from '../logger';
|
import { Logger } from '../logger';
|
||||||
import { RecentChangesAnnotationProvider } from './recentChangesAnnotationProvider';
|
|
||||||
import { WhitespaceController } from './whitespaceController';
|
import { WhitespaceController } from './whitespaceController';
|
||||||
import * as path from 'path';
|
|
||||||
|
|
||||||
export type FileAnnotationType = 'gutter' | 'hover' | 'recentChanges';
|
|
||||||
export const FileAnnotationType = {
|
|
||||||
Gutter: 'gutter' as FileAnnotationType,
|
|
||||||
Hover: 'hover' as FileAnnotationType,
|
|
||||||
RecentChanges: 'recentChanges' as FileAnnotationType
|
|
||||||
};
|
|
||||||
|
|
||||||
export const Decorations = {
|
export const Decorations = {
|
||||||
blameAnnotation: window.createTextEditorDecorationType({
|
annotation: window.createTextEditorDecorationType({
|
||||||
isWholeLine: true,
|
isWholeLine: true,
|
||||||
textDecoration: 'none'
|
textDecoration: 'none'
|
||||||
} as DecorationRenderOptions),
|
} as DecorationRenderOptions),
|
||||||
blameHighlight: undefined as TextEditorDecorationType | undefined,
|
highlight: undefined as TextEditorDecorationType | undefined
|
||||||
recentChangesAnnotation: undefined as TextEditorDecorationType | undefined,
|
|
||||||
recentChangesHighlight: undefined as TextEditorDecorationType | undefined
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export class AnnotationController extends Disposable {
|
export class AnnotationController extends Disposable {
|
||||||
@@ -59,8 +46,8 @@ export class AnnotationController extends Disposable {
|
|||||||
dispose() {
|
dispose() {
|
||||||
this._annotationProviders.forEach(async (p, i) => await this.clear(i));
|
this._annotationProviders.forEach(async (p, i) => await this.clear(i));
|
||||||
|
|
||||||
Decorations.blameAnnotation && Decorations.blameAnnotation.dispose();
|
Decorations.annotation && Decorations.annotation.dispose();
|
||||||
Decorations.blameHighlight && Decorations.blameHighlight.dispose();
|
Decorations.highlight && Decorations.highlight.dispose();
|
||||||
|
|
||||||
this._annotationsDisposable && this._annotationsDisposable.dispose();
|
this._annotationsDisposable && this._annotationsDisposable.dispose();
|
||||||
this._whitespaceController && this._whitespaceController.dispose();
|
this._whitespaceController && this._whitespaceController.dispose();
|
||||||
@@ -69,109 +56,67 @@ export class AnnotationController extends Disposable {
|
|||||||
|
|
||||||
private _onConfigurationChanged() {
|
private _onConfigurationChanged() {
|
||||||
let toggleWhitespace = workspace.getConfiguration(`${ExtensionKey}.advanced.toggleWhitespace`).get<boolean>('enabled');
|
let toggleWhitespace = workspace.getConfiguration(`${ExtensionKey}.advanced.toggleWhitespace`).get<boolean>('enabled');
|
||||||
// Until https://github.com/Microsoft/vscode/issues/11485 is fixed we need to toggle whitespace for non-monospace fonts and ligatures
|
if (!toggleWhitespace) {
|
||||||
// TODO: detect monospace vs non-monospace font
|
// Until https://github.com/Microsoft/vscode/issues/11485 is fixed we need to toggle whitespace for non-monospace fonts and ligatures
|
||||||
|
// TODO: detect monospace font
|
||||||
// if (!toggleWhitespace) {
|
toggleWhitespace = workspace.getConfiguration('editor').get<boolean>('fontLigatures');
|
||||||
// // Since we know ligatures will break the whitespace rendering -- turn it back on
|
|
||||||
// toggleWhitespace = workspace.getConfiguration('editor').get<boolean>('fontLigatures', false);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// If the setting is on and we aren't showing any annotations, make sure it is necessary (i.e. only when rendering whitespace)
|
|
||||||
if (toggleWhitespace && this._annotationProviders.size === 0) {
|
|
||||||
toggleWhitespace = (workspace.getConfiguration('editor').get<string>('renderWhitespace') !== 'none');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let changed = false;
|
if (toggleWhitespace && !this._whitespaceController) {
|
||||||
|
|
||||||
if (toggleWhitespace && this._whitespaceController === undefined) {
|
|
||||||
changed = true;
|
|
||||||
this._whitespaceController = new WhitespaceController();
|
this._whitespaceController = new WhitespaceController();
|
||||||
}
|
}
|
||||||
else if (!toggleWhitespace && this._whitespaceController !== undefined) {
|
else if (!toggleWhitespace && this._whitespaceController) {
|
||||||
changed = true;
|
|
||||||
this._whitespaceController.dispose();
|
this._whitespaceController.dispose();
|
||||||
this._whitespaceController = undefined;
|
this._whitespaceController = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
const cfg = workspace.getConfiguration().get<IConfig>(ExtensionKey)!;
|
const cfg = workspace.getConfiguration().get<IConfig>(ExtensionKey)!;
|
||||||
const cfgBlameHighlight = cfg.blame.file.lineHighlight;
|
const cfgHighlight = cfg.blame.file.lineHighlight;
|
||||||
const cfgChangesHighlight = cfg.recentChanges.file.lineHighlight;
|
|
||||||
const cfgTheme = cfg.theme.lineHighlight;
|
const cfgTheme = cfg.theme.lineHighlight;
|
||||||
|
|
||||||
if (!Objects.areEquivalent(cfgBlameHighlight, this._config && this._config.blame.file.lineHighlight) ||
|
let changed = false;
|
||||||
!Objects.areEquivalent(cfgChangesHighlight, this._config && this._config.recentChanges.file.lineHighlight) ||
|
|
||||||
|
if (!Objects.areEquivalent(cfgHighlight, this._config && this._config.blame.file.lineHighlight) ||
|
||||||
!Objects.areEquivalent(cfgTheme, this._config && this._config.theme.lineHighlight)) {
|
!Objects.areEquivalent(cfgTheme, this._config && this._config.theme.lineHighlight)) {
|
||||||
changed = true;
|
changed = true;
|
||||||
|
|
||||||
Decorations.blameHighlight && Decorations.blameHighlight.dispose();
|
Decorations.highlight && Decorations.highlight.dispose();
|
||||||
|
|
||||||
if (cfgBlameHighlight.enabled) {
|
if (cfgHighlight.enabled) {
|
||||||
Decorations.blameHighlight = window.createTextEditorDecorationType({
|
Decorations.highlight = window.createTextEditorDecorationType({
|
||||||
gutterIconSize: 'contain',
|
gutterIconSize: 'contain',
|
||||||
isWholeLine: true,
|
isWholeLine: true,
|
||||||
overviewRulerLane: OverviewRulerLane.Right,
|
overviewRulerLane: OverviewRulerLane.Right,
|
||||||
dark: {
|
dark: {
|
||||||
backgroundColor: cfgBlameHighlight.locations.includes(LineHighlightLocations.Line)
|
backgroundColor: cfgHighlight.locations.includes(BlameLineHighlightLocations.Line)
|
||||||
? cfgTheme.dark.backgroundColor || themeDefaults.lineHighlight.dark.backgroundColor
|
? cfgTheme.dark.backgroundColor || themeDefaults.lineHighlight.dark.backgroundColor
|
||||||
: undefined,
|
: undefined,
|
||||||
gutterIconPath: cfgBlameHighlight.locations.includes(LineHighlightLocations.Gutter)
|
gutterIconPath: cfgHighlight.locations.includes(BlameLineHighlightLocations.Gutter)
|
||||||
? this.context.asAbsolutePath('images/dark/highlight-gutter.svg')
|
? this.context.asAbsolutePath('images/blame-dark.svg')
|
||||||
: undefined,
|
: undefined,
|
||||||
overviewRulerColor: cfgBlameHighlight.locations.includes(LineHighlightLocations.OverviewRuler)
|
overviewRulerColor: cfgHighlight.locations.includes(BlameLineHighlightLocations.OverviewRuler)
|
||||||
? cfgTheme.dark.overviewRulerColor || themeDefaults.lineHighlight.dark.overviewRulerColor
|
? cfgTheme.dark.overviewRulerColor || themeDefaults.lineHighlight.dark.overviewRulerColor
|
||||||
: undefined
|
: undefined
|
||||||
},
|
},
|
||||||
light: {
|
light: {
|
||||||
backgroundColor: cfgBlameHighlight.locations.includes(LineHighlightLocations.Line)
|
backgroundColor: cfgHighlight.locations.includes(BlameLineHighlightLocations.Line)
|
||||||
? cfgTheme.light.backgroundColor || themeDefaults.lineHighlight.light.backgroundColor
|
? cfgTheme.light.backgroundColor || themeDefaults.lineHighlight.light.backgroundColor
|
||||||
: undefined,
|
: undefined,
|
||||||
gutterIconPath: cfgBlameHighlight.locations.includes(LineHighlightLocations.Gutter)
|
gutterIconPath: cfgHighlight.locations.includes(BlameLineHighlightLocations.Gutter)
|
||||||
? this.context.asAbsolutePath('images/light/highlight-gutter.svg')
|
? this.context.asAbsolutePath('images/blame-light.svg')
|
||||||
: undefined,
|
: undefined,
|
||||||
overviewRulerColor: cfgBlameHighlight.locations.includes(LineHighlightLocations.OverviewRuler)
|
overviewRulerColor: cfgHighlight.locations.includes(BlameLineHighlightLocations.OverviewRuler)
|
||||||
? cfgTheme.light.overviewRulerColor || themeDefaults.lineHighlight.light.overviewRulerColor
|
? cfgTheme.light.overviewRulerColor || themeDefaults.lineHighlight.light.overviewRulerColor
|
||||||
: undefined
|
: undefined
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Decorations.blameHighlight = undefined;
|
Decorations.highlight = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
Decorations.recentChangesHighlight && Decorations.recentChangesHighlight.dispose();
|
|
||||||
|
|
||||||
Decorations.recentChangesHighlight = window.createTextEditorDecorationType({
|
|
||||||
gutterIconSize: 'contain',
|
|
||||||
isWholeLine: true,
|
|
||||||
overviewRulerLane: OverviewRulerLane.Right,
|
|
||||||
dark: {
|
|
||||||
backgroundColor: cfgChangesHighlight.locations.includes(LineHighlightLocations.Line)
|
|
||||||
? cfgTheme.dark.backgroundColor || themeDefaults.lineHighlight.dark.backgroundColor
|
|
||||||
: undefined,
|
|
||||||
gutterIconPath: cfgChangesHighlight.locations.includes(LineHighlightLocations.Gutter)
|
|
||||||
? this.context.asAbsolutePath('images/dark/highlight-gutter.svg')
|
|
||||||
: undefined,
|
|
||||||
overviewRulerColor: cfgChangesHighlight.locations.includes(LineHighlightLocations.OverviewRuler)
|
|
||||||
? cfgTheme.dark.overviewRulerColor || themeDefaults.lineHighlight.dark.overviewRulerColor
|
|
||||||
: undefined
|
|
||||||
},
|
|
||||||
light: {
|
|
||||||
backgroundColor: cfgChangesHighlight.locations.includes(LineHighlightLocations.Line)
|
|
||||||
? cfgTheme.light.backgroundColor || themeDefaults.lineHighlight.light.backgroundColor
|
|
||||||
: undefined,
|
|
||||||
gutterIconPath: cfgChangesHighlight.locations.includes(LineHighlightLocations.Gutter)
|
|
||||||
? this.context.asAbsolutePath('images/light/highlight-gutter.svg')
|
|
||||||
: undefined,
|
|
||||||
overviewRulerColor: cfgChangesHighlight.locations.includes(LineHighlightLocations.OverviewRuler)
|
|
||||||
? cfgTheme.light.overviewRulerColor || themeDefaults.lineHighlight.light.overviewRulerColor
|
|
||||||
: undefined
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Objects.areEquivalent(cfg.blame.file, this._config && this._config.blame.file) ||
|
if (!Objects.areEquivalent(cfg.blame.file, this._config && this._config.blame.file) ||
|
||||||
!Objects.areEquivalent(cfg.recentChanges.file, this._config && this._config.recentChanges.file) ||
|
|
||||||
!Objects.areEquivalent(cfg.annotations, this._config && this._config.annotations) ||
|
!Objects.areEquivalent(cfg.annotations, this._config && this._config.annotations) ||
|
||||||
!Objects.areEquivalent(cfg.theme.annotations, this._config && this._config.theme.annotations)) {
|
!Objects.areEquivalent(cfg.theme.annotations, this._config && this._config.theme.annotations)) {
|
||||||
changed = true;
|
changed = true;
|
||||||
@@ -184,31 +129,20 @@ export class AnnotationController extends Disposable {
|
|||||||
for (const provider of this._annotationProviders.values()) {
|
for (const provider of this._annotationProviders.values()) {
|
||||||
if (provider === undefined) continue;
|
if (provider === undefined) continue;
|
||||||
|
|
||||||
if (provider.annotationType === FileAnnotationType.RecentChanges) {
|
provider.reset();
|
||||||
provider.reset(Decorations.recentChangesAnnotation, Decorations.recentChangesHighlight);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
provider.reset(Decorations.blameAnnotation, Decorations.blameHighlight, this._whitespaceController);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async clear(column: number) {
|
async clear(column: number) {
|
||||||
const provider = this._annotationProviders.get(column);
|
const provider = this._annotationProviders.get(column);
|
||||||
if (provider === undefined) return;
|
if (!provider) return;
|
||||||
|
|
||||||
this._annotationProviders.delete(column);
|
this._annotationProviders.delete(column);
|
||||||
await provider.dispose();
|
await provider.dispose();
|
||||||
|
|
||||||
if (this._annotationProviders.size === 0) {
|
if (this._annotationProviders.size === 0) {
|
||||||
Logger.log(`Remove listener registrations for annotations`);
|
Logger.log(`Remove listener registrations for annotations`);
|
||||||
|
|
||||||
await setCommandContext(CommandContext.AnnotationStatus, undefined);
|
|
||||||
|
|
||||||
this._keyboardScope && this._keyboardScope.dispose();
|
|
||||||
this._keyboardScope = undefined;
|
|
||||||
|
|
||||||
this._annotationsDisposable && this._annotationsDisposable.dispose();
|
this._annotationsDisposable && this._annotationsDisposable.dispose();
|
||||||
this._annotationsDisposable = undefined;
|
this._annotationsDisposable = undefined;
|
||||||
}
|
}
|
||||||
@@ -216,86 +150,35 @@ export class AnnotationController extends Disposable {
|
|||||||
this._onDidToggleAnnotations.fire();
|
this._onDidToggleAnnotations.fire();
|
||||||
}
|
}
|
||||||
|
|
||||||
getAnnotationType(editor: TextEditor | undefined): FileAnnotationType | undefined {
|
getAnnotationType(editor: TextEditor): FileAnnotationType | undefined {
|
||||||
const provider = this.getProvider(editor);
|
const provider = this.getProvider(editor);
|
||||||
return provider === undefined ? undefined : provider.annotationType;
|
return provider === undefined ? undefined : provider.annotationType;
|
||||||
}
|
}
|
||||||
|
|
||||||
getProvider(editor: TextEditor | undefined): AnnotationProviderBase | undefined {
|
getProvider(editor: TextEditor): AnnotationProviderBase | undefined {
|
||||||
if (editor === undefined || editor.document === undefined || !this.git.isEditorBlameable(editor)) return undefined;
|
if (!editor || !editor.document || !this.git.isEditorBlameable(editor)) return undefined;
|
||||||
|
|
||||||
return this._annotationProviders.get(editor.viewColumn || -1);
|
return this._annotationProviders.get(editor.viewColumn || -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _keyboardScope: KeyboardScope | undefined = undefined;
|
|
||||||
|
|
||||||
async showAnnotations(editor: TextEditor, type: FileAnnotationType, shaOrLine?: string | number): Promise<boolean> {
|
async showAnnotations(editor: TextEditor, type: FileAnnotationType, shaOrLine?: string | number): Promise<boolean> {
|
||||||
if (!editor || !editor.document || !this.git.isEditorBlameable(editor)) return false;
|
if (!editor || !editor.document || !this.git.isEditorBlameable(editor)) return false;
|
||||||
|
|
||||||
const currentProvider = this._annotationProviders.get(editor.viewColumn || -1);
|
const currentProvider = this._annotationProviders.get(editor.viewColumn || -1);
|
||||||
if (currentProvider !== undefined && TextEditorComparer.equals(currentProvider.editor, editor)) {
|
if (currentProvider && TextEditorComparer.equals(currentProvider.editor, editor)) {
|
||||||
await currentProvider.selection(shaOrLine);
|
await currentProvider.selection(shaOrLine);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return window.withProgress({ location: ProgressLocation.Window }, async (progress: Progress<{ message: string }>) => {
|
|
||||||
await setCommandContext(CommandContext.AnnotationStatus, 'computing');
|
|
||||||
|
|
||||||
const computingAnnotations = this._showAnnotationsCore(currentProvider, editor, type, shaOrLine, progress);
|
|
||||||
const result = await computingAnnotations;
|
|
||||||
|
|
||||||
await setCommandContext(CommandContext.AnnotationStatus, result ? 'computed' : undefined);
|
|
||||||
|
|
||||||
return computingAnnotations;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private async _showAnnotationsCore(currentProvider: AnnotationProviderBase | undefined, editor: TextEditor, type: FileAnnotationType, shaOrLine?: string | number, progress?: Progress<{ message: string}>): Promise<boolean> {
|
|
||||||
if (progress !== undefined) {
|
|
||||||
let annotationsLabel = 'annotations';
|
|
||||||
switch (type) {
|
|
||||||
case FileAnnotationType.Gutter:
|
|
||||||
case FileAnnotationType.Hover:
|
|
||||||
annotationsLabel = 'blame annotations';
|
|
||||||
break;
|
|
||||||
|
|
||||||
case FileAnnotationType.RecentChanges:
|
|
||||||
annotationsLabel = 'recent changes annotations';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
progress!.report({ message: `Computing ${annotationsLabel} for ${path.basename(editor.document.fileName)}` });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allows pressing escape to exit the annotations
|
|
||||||
if (this._keyboardScope === undefined) {
|
|
||||||
this._keyboardScope = await Keyboard.instance.beginScope({
|
|
||||||
escape: {
|
|
||||||
onDidPressKey: (key: Keys) => {
|
|
||||||
const e = window.activeTextEditor;
|
|
||||||
if (e === undefined) return Promise.resolve(undefined);
|
|
||||||
|
|
||||||
this.clear(e.viewColumn || -1);
|
|
||||||
return Promise.resolve(undefined);
|
|
||||||
}
|
|
||||||
} as KeyCommand
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const gitUri = await GitUri.fromUri(editor.document.uri, this.git);
|
const gitUri = await GitUri.fromUri(editor.document.uri, this.git);
|
||||||
|
|
||||||
let provider: AnnotationProviderBase | undefined = undefined;
|
let provider: AnnotationProviderBase | undefined = undefined;
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case FileAnnotationType.Gutter:
|
case FileAnnotationType.Gutter:
|
||||||
provider = new GutterBlameAnnotationProvider(this.context, editor, Decorations.blameAnnotation, Decorations.blameHighlight, this._whitespaceController, this.git, gitUri);
|
provider = new GutterBlameAnnotationProvider(this.context, editor, Decorations.annotation, Decorations.highlight, this._whitespaceController, this.git, gitUri);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FileAnnotationType.Hover:
|
case FileAnnotationType.Hover:
|
||||||
provider = new HoverBlameAnnotationProvider(this.context, editor, Decorations.blameAnnotation, Decorations.blameHighlight, this._whitespaceController, this.git, gitUri);
|
provider = new HoverBlameAnnotationProvider(this.context, editor, Decorations.annotation, Decorations.highlight, this._whitespaceController, this.git, gitUri);
|
||||||
break;
|
|
||||||
|
|
||||||
case FileAnnotationType.RecentChanges:
|
|
||||||
provider = new RecentChangesAnnotationProvider(this.context, editor, undefined, Decorations.recentChangesHighlight!, this.git, gitUri);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (provider === undefined || !(await provider.validate())) return false;
|
if (provider === undefined || !(await provider.validate())) return false;
|
||||||
@@ -313,7 +196,7 @@ export class AnnotationController extends Disposable {
|
|||||||
subscriptions.push(window.onDidChangeTextEditorViewColumn(this._onTextEditorViewColumnChanged, this));
|
subscriptions.push(window.onDidChangeTextEditorViewColumn(this._onTextEditorViewColumnChanged, this));
|
||||||
subscriptions.push(workspace.onDidChangeTextDocument(this._onTextDocumentChanged, this));
|
subscriptions.push(workspace.onDidChangeTextDocument(this._onTextDocumentChanged, this));
|
||||||
subscriptions.push(workspace.onDidCloseTextDocument(this._onTextDocumentClosed, this));
|
subscriptions.push(workspace.onDidCloseTextDocument(this._onTextDocumentClosed, this));
|
||||||
subscriptions.push(this.gitContextTracker.onDidChangeBlameability(this._onBlameabilityChanged, this));
|
subscriptions.push(this.gitContextTracker.onDidBlameabilityChange(this._onBlameabilityChanged, this));
|
||||||
|
|
||||||
this._annotationsDisposable = Disposable.from(...subscriptions);
|
this._annotationsDisposable = Disposable.from(...subscriptions);
|
||||||
}
|
}
|
||||||
@@ -323,22 +206,17 @@ export class AnnotationController extends Disposable {
|
|||||||
this._onDidToggleAnnotations.fire();
|
this._onDidToggleAnnotations.fire();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
async toggleAnnotations(editor: TextEditor, type: FileAnnotationType, shaOrLine?: string | number): Promise<boolean> {
|
async toggleAnnotations(editor: TextEditor, type: FileAnnotationType, shaOrLine?: string | number): Promise<boolean> {
|
||||||
if (!editor || !editor.document || (type === FileAnnotationType.RecentChanges ? !this.git.isTrackable(editor.document.uri) : !this.git.isEditorBlameable(editor))) return false;
|
if (!editor || !editor.document || !this.git.isEditorBlameable(editor)) return false;
|
||||||
|
|
||||||
const provider = this._annotationProviders.get(editor.viewColumn || -1);
|
const provider = this._annotationProviders.get(editor.viewColumn || -1);
|
||||||
if (provider === undefined) return this.showAnnotations(editor, type, shaOrLine);
|
if (provider === undefined) return this.showAnnotations(editor, type, shaOrLine);
|
||||||
|
|
||||||
const reopen = provider.annotationType !== type;
|
|
||||||
await this.clear(provider.editor.viewColumn || -1);
|
await this.clear(provider.editor.viewColumn || -1);
|
||||||
|
return false;
|
||||||
if (!reopen) return false;
|
|
||||||
|
|
||||||
return this.showAnnotations(editor, type, shaOrLine);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private _onBlameabilityChanged(e: BlameabilityChangeEvent) {
|
private _onBlameabilityChanged(e: BlameabilityChangeEvent) {
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
// import { Functions } from '../system';
|
import { Functions } from '../system';
|
||||||
import { Disposable, ExtensionContext, TextDocument, TextEditor, TextEditorDecorationType, TextEditorSelectionChangeEvent, window, workspace } from 'vscode';
|
import { Disposable, ExtensionContext, TextDocument, TextEditor, TextEditorDecorationType, TextEditorSelectionChangeEvent, window, workspace } from 'vscode';
|
||||||
import { FileAnnotationType } from '../annotations/annotationController';
|
|
||||||
import { TextDocumentComparer } from '../comparers';
|
import { TextDocumentComparer } from '../comparers';
|
||||||
import { ExtensionKey, IConfig } from '../configuration';
|
import { ExtensionKey, FileAnnotationType, IConfig } from '../configuration';
|
||||||
import { WhitespaceController } from './whitespaceController';
|
import { WhitespaceController } from './whitespaceController';
|
||||||
|
|
||||||
export abstract class AnnotationProviderBase extends Disposable {
|
export abstract class AnnotationProviderBase extends Disposable {
|
||||||
@@ -14,7 +13,7 @@ import { WhitespaceController } from './whitespaceController';
|
|||||||
protected _config: IConfig;
|
protected _config: IConfig;
|
||||||
protected _disposable: Disposable;
|
protected _disposable: Disposable;
|
||||||
|
|
||||||
constructor(context: ExtensionContext, public editor: TextEditor, protected decoration: TextEditorDecorationType | undefined, protected highlightDecoration: TextEditorDecorationType | undefined, protected whitespaceController: WhitespaceController | undefined) {
|
constructor(context: ExtensionContext, public editor: TextEditor, protected decoration: TextEditorDecorationType, protected highlightDecoration: TextEditorDecorationType | undefined, protected whitespaceController: WhitespaceController | undefined) {
|
||||||
super(() => this.dispose());
|
super(() => this.dispose());
|
||||||
|
|
||||||
this.document = this.editor.document;
|
this.document = this.editor.document;
|
||||||
@@ -43,12 +42,15 @@ import { WhitespaceController } from './whitespaceController';
|
|||||||
async clear() {
|
async clear() {
|
||||||
if (this.editor !== undefined) {
|
if (this.editor !== undefined) {
|
||||||
try {
|
try {
|
||||||
|
this.editor.setDecorations(this.decoration, []);
|
||||||
|
this.highlightDecoration && this.editor.setDecorations(this.highlightDecoration, []);
|
||||||
|
// I have no idea why the decorators sometimes don't get removed, but if they don't try again with a tiny delay
|
||||||
if (this.highlightDecoration !== undefined) {
|
if (this.highlightDecoration !== undefined) {
|
||||||
this.editor.setDecorations(this.highlightDecoration, []);
|
await Functions.wait(1);
|
||||||
}
|
|
||||||
|
|
||||||
if (this.decoration !== undefined) {
|
if (this.highlightDecoration === undefined) return;
|
||||||
this.editor.setDecorations(this.decoration, []);
|
|
||||||
|
this.editor.setDecorations(this.highlightDecoration, []);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (ex) { }
|
catch (ex) { }
|
||||||
@@ -58,13 +60,10 @@ import { WhitespaceController } from './whitespaceController';
|
|||||||
this.whitespaceController && await this.whitespaceController.restore();
|
this.whitespaceController && await this.whitespaceController.restore();
|
||||||
}
|
}
|
||||||
|
|
||||||
async reset(decoration: TextEditorDecorationType | undefined, highlightDecoration: TextEditorDecorationType | undefined, whitespaceController?: WhitespaceController) {
|
async reset() {
|
||||||
await this.clear();
|
await this.clear();
|
||||||
|
|
||||||
this._config = workspace.getConfiguration().get<IConfig>(ExtensionKey)!;
|
this._config = workspace.getConfiguration().get<IConfig>(ExtensionKey)!;
|
||||||
this.decoration = decoration;
|
|
||||||
this.highlightDecoration = highlightDecoration;
|
|
||||||
this.whitespaceController = whitespaceController;
|
|
||||||
|
|
||||||
await this.provideAnnotation(this.editor === undefined ? undefined : this.editor.selection.active.line);
|
await this.provideAnnotation(this.editor === undefined ? undefined : this.editor.selection.active.line);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import { Dates, Strings } from '../system';
|
import { DecorationInstanceRenderOptions, DecorationOptions, ThemableDecorationRenderOptions } from 'vscode';
|
||||||
import { DecorationInstanceRenderOptions, DecorationOptions, MarkdownString, ThemableDecorationRenderOptions } from 'vscode';
|
|
||||||
import { DiffWithCommand, OpenCommitInRemoteCommand, ShowQuickCommitDetailsCommand } from '../commands';
|
|
||||||
import { IThemeConfig, themeDefaults } from '../configuration';
|
import { IThemeConfig, themeDefaults } from '../configuration';
|
||||||
import { GlyphChars } from '../constants';
|
import { CommitFormatter, GitCommit, GitService, GitUri, ICommitFormatOptions } from '../gitService';
|
||||||
import { CommitFormatter, GitCommit, GitDiffChunkLine, GitService, GitUri, ICommitFormatOptions } from '../gitService';
|
import * as moment from 'moment';
|
||||||
|
|
||||||
interface IHeatmapConfig {
|
interface IHeatmapConfig {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
@@ -22,18 +20,16 @@ interface IRenderOptions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const endOfLineIndex = 1000000;
|
export const endOfLineIndex = 1000000;
|
||||||
const escapeMarkdownRegEx = /[`\>\#\*\_\-\+\.]/g;
|
|
||||||
// const sampleMarkdown = '## message `not code` *not important* _no underline_ \n> don\'t quote me \n- don\'t list me \n+ don\'t list me \n1. don\'t list me \nnot h1 \n=== \nnot h2 \n---\n***\n---\n___';
|
|
||||||
|
|
||||||
export class Annotations {
|
export class Annotations {
|
||||||
|
|
||||||
static applyHeatmap(decoration: DecorationOptions, date: Date, now: number) {
|
static applyHeatmap(decoration: DecorationOptions, date: Date, now: moment.Moment) {
|
||||||
const color = this._getHeatmapColor(now, date);
|
const color = this._getHeatmapColor(now, date);
|
||||||
(decoration.renderOptions!.before! as any).borderColor = color;
|
(decoration.renderOptions!.before! as any).borderColor = color;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static _getHeatmapColor(now: number, date: Date) {
|
private static _getHeatmapColor(now: moment.Moment, date: Date) {
|
||||||
const days = Dates.dateDaysFromNow(date, now);
|
const days = now.diff(moment(date), 'days');
|
||||||
|
|
||||||
if (days <= 2) return '#ffeca7';
|
if (days <= 2) return '#ffeca7';
|
||||||
if (days <= 7) return '#ffdd8c';
|
if (days <= 7) return '#ffdd8c';
|
||||||
@@ -47,69 +43,34 @@ export class Annotations {
|
|||||||
return '#793738';
|
return '#793738';
|
||||||
}
|
}
|
||||||
|
|
||||||
static getHoverMessage(commit: GitCommit, dateFormat: string | null, hasRemotes: boolean): MarkdownString {
|
|
||||||
if (dateFormat === null) {
|
|
||||||
dateFormat = 'MMMM Do, YYYY h:MMa';
|
|
||||||
}
|
|
||||||
|
|
||||||
let message = '';
|
|
||||||
if (!commit.isUncommitted) {
|
|
||||||
message = commit.message
|
|
||||||
// Escape markdown
|
|
||||||
.replace(escapeMarkdownRegEx, '\\$&')
|
|
||||||
// Escape markdown header (since the above regex won't match it)
|
|
||||||
.replace(/^===/gm, `${GlyphChars.ZeroWidthSpace}===`)
|
|
||||||
// Keep under the same block-quote
|
|
||||||
.replace(/\n/g, ' \n');
|
|
||||||
message = `\n\n> ${message}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
const openInRemoteCommand = hasRemotes
|
|
||||||
? `${' '.repeat(3)} [\`${GlyphChars.ArrowUpRight}\`](${OpenCommitInRemoteCommand.getMarkdownCommandArgs(commit.sha)} "Open in Remote")`
|
|
||||||
: '';
|
|
||||||
|
|
||||||
const markdown = new MarkdownString(`[\`${commit.shortSha}\`](${ShowQuickCommitDetailsCommand.getMarkdownCommandArgs(commit.sha)} "Show Commit Details") __${commit.author}__, ${commit.fromNow()} _(${commit.formatDate(dateFormat)})_ ${openInRemoteCommand} ${message}`);
|
|
||||||
markdown.isTrusted = true;
|
|
||||||
return markdown;
|
|
||||||
}
|
|
||||||
|
|
||||||
static getHoverDiffMessage(commit: GitCommit, chunkLine: GitDiffChunkLine | undefined): MarkdownString | undefined {
|
|
||||||
if (chunkLine === undefined) return undefined;
|
|
||||||
|
|
||||||
const codeDiff = this._getCodeDiff(chunkLine);
|
|
||||||
const markdown = new MarkdownString(commit.isUncommitted
|
|
||||||
? `[\`Changes\`](${DiffWithCommand.getMarkdownCommandArgs(commit)} "Open Changes") ${GlyphChars.Dash} _uncommitted_\n${codeDiff}`
|
|
||||||
: `[\`Changes\`](${DiffWithCommand.getMarkdownCommandArgs(commit)} "Open Changes") ${GlyphChars.Dash} [\`${commit.previousShortSha}\`](${ShowQuickCommitDetailsCommand.getMarkdownCommandArgs(commit.previousSha!)} "Show Commit Details") ${GlyphChars.ArrowLeftRight} [\`${commit.shortSha}\`](${ShowQuickCommitDetailsCommand.getMarkdownCommandArgs(commit.sha)} "Show Commit Details")\n${codeDiff}`);
|
|
||||||
markdown.isTrusted = true;
|
|
||||||
return markdown;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static _getCodeDiff(chunkLine: GitDiffChunkLine): string {
|
|
||||||
const previous = chunkLine.previous === undefined ? undefined : chunkLine.previous[0];
|
|
||||||
return `\`\`\`
|
|
||||||
- ${previous === undefined || previous.line === undefined ? '' : previous.line.trim()}
|
|
||||||
+ ${chunkLine.line === undefined ? '' : chunkLine.line.trim()}
|
|
||||||
\`\`\``;
|
|
||||||
}
|
|
||||||
|
|
||||||
static async changesHover(commit: GitCommit, line: number, uri: GitUri, git: GitService): Promise<DecorationOptions> {
|
static async changesHover(commit: GitCommit, line: number, uri: GitUri, git: GitService): Promise<DecorationOptions> {
|
||||||
const chunkLine = await git.getDiffForLine(uri, line + uri.offset, commit.isUncommitted ? undefined : commit.previousSha);
|
let message: string | undefined = undefined;
|
||||||
const message = this.getHoverDiffMessage(commit, chunkLine);
|
if (commit.isUncommitted) {
|
||||||
|
const [previous, current] = await git.getDiffForLine(uri, line + uri.offset);
|
||||||
|
message = CommitFormatter.toHoverDiff(commit, previous, current);
|
||||||
|
}
|
||||||
|
else if (commit.previousSha !== undefined) {
|
||||||
|
const [previous, current] = await git.getDiffForLine(uri, line + uri.offset, commit.previousSha);
|
||||||
|
message = CommitFormatter.toHoverDiff(commit, previous, current);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
hoverMessage: message
|
hoverMessage: message
|
||||||
} as DecorationOptions;
|
} as DecorationOptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
static detailsHover(commit: GitCommit, dateFormat: string | null, hasRemotes: boolean): DecorationOptions {
|
static detailsHover(commit: GitCommit): DecorationOptions {
|
||||||
const message = this.getHoverMessage(commit, dateFormat, hasRemotes);
|
const message = CommitFormatter.toHoverAnnotation(commit);
|
||||||
return {
|
return {
|
||||||
hoverMessage: message
|
hoverMessage: message
|
||||||
} as DecorationOptions;
|
} as DecorationOptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
static gutter(commit: GitCommit, format: string, dateFormatOrFormatOptions: string | null | ICommitFormatOptions, renderOptions: IRenderOptions): DecorationOptions {
|
static gutter(commit: GitCommit, format: string, dateFormatOrFormatOptions: string | null | ICommitFormatOptions, renderOptions: IRenderOptions, compact: boolean): DecorationOptions {
|
||||||
const content = Strings.pad(CommitFormatter.fromTemplate(format, commit, dateFormatOrFormatOptions), 1, 1);
|
let content = `\u00a0${CommitFormatter.fromTemplate(format, commit, dateFormatOrFormatOptions)}\u00a0`;
|
||||||
|
if (compact) {
|
||||||
|
content = '\u00a0'.repeat(content.length);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
renderOptions: {
|
renderOptions: {
|
||||||
@@ -151,28 +112,26 @@ export class Annotations {
|
|||||||
before: {
|
before: {
|
||||||
borderStyle: borderStyle,
|
borderStyle: borderStyle,
|
||||||
borderWidth: borderWidth,
|
borderWidth: borderWidth,
|
||||||
height: '100%',
|
height: cfgFileTheme.separateLines ? 'calc(100% - 1px)' : '100%',
|
||||||
margin: '0 26px -1px 0'
|
margin: '0 26px 0 0',
|
||||||
|
textDecoration: 'none'
|
||||||
},
|
},
|
||||||
dark: {
|
dark: {
|
||||||
backgroundColor: cfgFileTheme.dark.backgroundColor || undefined,
|
backgroundColor: cfgFileTheme.dark.backgroundColor || undefined,
|
||||||
color: cfgFileTheme.dark.foregroundColor || themeDefaults.annotations.file.gutter.dark.foregroundColor,
|
color: cfgFileTheme.dark.foregroundColor || themeDefaults.annotations.file.gutter.dark.foregroundColor
|
||||||
textDecoration: cfgFileTheme.separateLines ? 'overline solid rgba(0, 0, 0, .2)' : 'none'
|
|
||||||
} as DecorationInstanceRenderOptions,
|
} as DecorationInstanceRenderOptions,
|
||||||
light: {
|
light: {
|
||||||
backgroundColor: cfgFileTheme.light.backgroundColor || undefined,
|
backgroundColor: cfgFileTheme.light.backgroundColor || undefined,
|
||||||
color: cfgFileTheme.light.foregroundColor || themeDefaults.annotations.file.gutter.light.foregroundColor,
|
color: cfgFileTheme.light.foregroundColor || themeDefaults.annotations.file.gutter.light.foregroundColor
|
||||||
textDecoration: cfgFileTheme.separateLines ? 'overline solid rgba(0, 0, 0, .05)' : 'none'
|
|
||||||
} as DecorationInstanceRenderOptions
|
} as DecorationInstanceRenderOptions
|
||||||
} as IRenderOptions;
|
} as IRenderOptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
static hover(commit: GitCommit, renderOptions: IRenderOptions, now: number): DecorationOptions {
|
static hover(commit: GitCommit, renderOptions: IRenderOptions, heatmap: boolean): DecorationOptions {
|
||||||
const decoration = {
|
return {
|
||||||
renderOptions: { before: { ...renderOptions.before } }
|
hoverMessage: CommitFormatter.toHoverAnnotation(commit),
|
||||||
|
renderOptions: heatmap ? { before: { ...renderOptions.before } } : undefined
|
||||||
} as DecorationOptions;
|
} as DecorationOptions;
|
||||||
this.applyHeatmap(decoration, commit.date, now);
|
|
||||||
return decoration;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static hoverRenderOptions(cfgTheme: IThemeConfig, heatmap: IHeatmapConfig): IRenderOptions {
|
static hoverRenderOptions(cfgTheme: IThemeConfig, heatmap: IHeatmapConfig): IRenderOptions {
|
||||||
@@ -182,8 +141,8 @@ export class Annotations {
|
|||||||
before: {
|
before: {
|
||||||
borderStyle: 'solid',
|
borderStyle: 'solid',
|
||||||
borderWidth: '0 0 0 2px',
|
borderWidth: '0 0 0 2px',
|
||||||
contentText: GlyphChars.ZeroWidthSpace,
|
contentText: '\u200B',
|
||||||
height: '100%',
|
height: cfgTheme.annotations.file.hover.separateLines ? 'calc(100% - 1px)' : '100%',
|
||||||
margin: '0 26px 0 0',
|
margin: '0 26px 0 0',
|
||||||
textDecoration: 'none'
|
textDecoration: 'none'
|
||||||
}
|
}
|
||||||
@@ -191,14 +150,11 @@ export class Annotations {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static trailing(commit: GitCommit, format: string, dateFormat: string | null, cfgTheme: IThemeConfig): DecorationOptions {
|
static trailing(commit: GitCommit, format: string, dateFormat: string | null, cfgTheme: IThemeConfig): DecorationOptions {
|
||||||
const message = CommitFormatter.fromTemplate(format, commit, {
|
const message = CommitFormatter.fromTemplate(format, commit, dateFormat);
|
||||||
truncateMessageAtNewLine: true,
|
|
||||||
dateFormat: dateFormat
|
|
||||||
} as ICommitFormatOptions);
|
|
||||||
return {
|
return {
|
||||||
renderOptions: {
|
renderOptions: {
|
||||||
after: {
|
after: {
|
||||||
contentText: Strings.pad(message, 1, 1)
|
contentText: `\u00a0${message}\u00a0`
|
||||||
},
|
},
|
||||||
dark: {
|
dark: {
|
||||||
after: {
|
after: {
|
||||||
|
|||||||
@@ -1,28 +1,21 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { Iterables } from '../system';
|
import { Iterables } from '../system';
|
||||||
import { CancellationToken, Disposable, ExtensionContext, Hover, HoverProvider, languages, Position, Range, TextDocument, TextEditor, TextEditorDecorationType } from 'vscode';
|
import { ExtensionContext, Range, TextEditor, TextEditorDecorationType } from 'vscode';
|
||||||
import { AnnotationProviderBase } from './annotationProvider';
|
import { AnnotationProviderBase } from './annotationProvider';
|
||||||
import { Annotations, endOfLineIndex } from './annotations';
|
import { GitService, GitUri, IGitBlame } from '../gitService';
|
||||||
import { GitBlame, GitCommit, GitService, GitUri } from '../gitService';
|
|
||||||
import { WhitespaceController } from './whitespaceController';
|
import { WhitespaceController } from './whitespaceController';
|
||||||
|
|
||||||
export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase implements HoverProvider {
|
export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase {
|
||||||
|
|
||||||
protected _blame: Promise<GitBlame | undefined>;
|
protected _blame: Promise<IGitBlame>;
|
||||||
protected _hoverProviderDisposable: Disposable;
|
|
||||||
|
|
||||||
constructor(context: ExtensionContext, editor: TextEditor, decoration: TextEditorDecorationType | undefined, highlightDecoration: TextEditorDecorationType | undefined, whitespaceController: WhitespaceController | undefined, protected git: GitService, protected uri: GitUri) {
|
constructor(context: ExtensionContext, editor: TextEditor, decoration: TextEditorDecorationType, highlightDecoration: TextEditorDecorationType | undefined, whitespaceController: WhitespaceController | undefined, protected git: GitService, protected uri: GitUri) {
|
||||||
super(context, editor, decoration, highlightDecoration, whitespaceController);
|
super(context, editor, decoration, highlightDecoration, whitespaceController);
|
||||||
|
|
||||||
this._blame = this.git.getBlameForFile(this.uri);
|
this._blame = this.git.getBlameForFile(this.uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
async clear() {
|
async selection(shaOrLine?: string | number, blame?: IGitBlame) {
|
||||||
this._hoverProviderDisposable && this._hoverProviderDisposable.dispose();
|
|
||||||
super.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
async selection(shaOrLine?: string | number, blame?: GitBlame) {
|
|
||||||
if (!this.highlightDecoration) return;
|
if (!this.highlightDecoration) return;
|
||||||
|
|
||||||
if (blame === undefined) {
|
if (blame === undefined) {
|
||||||
@@ -64,55 +57,26 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
|
|||||||
return blame !== undefined && blame.lines.length !== 0;
|
return blame !== undefined && blame.lines.length !== 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async getBlame(requiresWhitespaceHack: boolean): Promise<GitBlame | undefined> {
|
protected async getBlame(requiresWhitespaceHack: boolean): Promise<IGitBlame | undefined> {
|
||||||
let whitespacePromise: Promise<void> | undefined;
|
let whitespacePromise: Promise<void> | undefined;
|
||||||
// HACK: Until https://github.com/Microsoft/vscode/issues/11485 is fixed -- override whitespace (turn off)
|
// HACK: Until https://github.com/Microsoft/vscode/issues/11485 is fixed -- override whitespace (turn off)
|
||||||
if (requiresWhitespaceHack) {
|
if (requiresWhitespaceHack) {
|
||||||
whitespacePromise = this.whitespaceController && this.whitespaceController.override();
|
whitespacePromise = this.whitespaceController && this.whitespaceController.override();
|
||||||
}
|
}
|
||||||
|
|
||||||
let blame: GitBlame | undefined;
|
let blame: IGitBlame;
|
||||||
if (whitespacePromise !== undefined) {
|
if (whitespacePromise) {
|
||||||
[blame] = await Promise.all([this._blame, whitespacePromise]);
|
[blame] = await Promise.all([this._blame, whitespacePromise]);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
blame = await this._blame;
|
blame = await this._blame;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (blame === undefined || blame.lines.length === 0) {
|
if (!blame || !blame.lines.length) {
|
||||||
this.whitespaceController && await this.whitespaceController.restore();
|
this.whitespaceController && await this.whitespaceController.restore();
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
return blame;
|
return blame;
|
||||||
}
|
}
|
||||||
|
|
||||||
registerHoverProvider() {
|
|
||||||
this._hoverProviderDisposable = languages.registerHoverProvider({ pattern: this.uri.fsPath }, this);
|
|
||||||
}
|
|
||||||
|
|
||||||
async provideHover(document: TextDocument, position: Position, token: CancellationToken): Promise<Hover | undefined> {
|
|
||||||
// Avoid double annotations if we are showing the whole-file hover blame annotations
|
|
||||||
if (this._config.blame.line.enabled && this.editor.selection.start.line === position.line) return undefined;
|
|
||||||
|
|
||||||
const cfg = this._config.annotations.file.gutter;
|
|
||||||
if (!cfg.hover.wholeLine && position.character !== 0) return undefined;
|
|
||||||
|
|
||||||
const blame = await this.getBlame(true);
|
|
||||||
if (blame === undefined) return undefined;
|
|
||||||
|
|
||||||
const line = blame.lines[position.line - this.uri.offset];
|
|
||||||
|
|
||||||
const commit = blame.commits.get(line.sha);
|
|
||||||
if (commit === undefined) return undefined;
|
|
||||||
|
|
||||||
// Get the full commit message -- since blame only returns the summary
|
|
||||||
let logCommit: GitCommit | undefined = undefined;
|
|
||||||
if (!commit.isUncommitted) {
|
|
||||||
logCommit = await this.git.getLogCommit(commit.repoPath, commit.uri.fsPath, commit.sha);
|
|
||||||
}
|
|
||||||
|
|
||||||
const message = Annotations.getHoverMessage(logCommit || commit, this._config.defaultDateFormat, this.git.hasRemotes(commit.repoPath));
|
|
||||||
return new Hover(message, document.validateRange(new Range(position.line, 0, position.line, endOfLineIndex)));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
69
src/annotations/diffAnnotationProvider.ts
Normal file
69
src/annotations/diffAnnotationProvider.ts
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
'use strict';
|
||||||
|
import { DecorationOptions, ExtensionContext, Position, Range, TextEditor, TextEditorDecorationType } from 'vscode';
|
||||||
|
import { AnnotationProviderBase } from './annotationProvider';
|
||||||
|
import { GitService, GitUri } from '../gitService';
|
||||||
|
import { WhitespaceController } from './whitespaceController';
|
||||||
|
|
||||||
|
export class DiffAnnotationProvider extends AnnotationProviderBase {
|
||||||
|
|
||||||
|
constructor(context: ExtensionContext, editor: TextEditor, decoration: TextEditorDecorationType, highlightDecoration: TextEditorDecorationType | undefined, whitespaceController: WhitespaceController | undefined, private git: GitService, private uri: GitUri) {
|
||||||
|
super(context, editor, decoration, highlightDecoration, whitespaceController);
|
||||||
|
}
|
||||||
|
|
||||||
|
async provideAnnotation(shaOrLine?: string | number): Promise<boolean> {
|
||||||
|
// let sha1: string | undefined = undefined;
|
||||||
|
// let sha2: string | undefined = undefined;
|
||||||
|
// if (shaOrLine === undefined) {
|
||||||
|
// const commit = await this.git.getLogCommit(this.uri.repoPath, this.uri.fsPath, { previous: true });
|
||||||
|
// if (commit === undefined) return false;
|
||||||
|
|
||||||
|
// sha1 = commit.previousSha;
|
||||||
|
// }
|
||||||
|
// else if (typeof shaOrLine === 'string') {
|
||||||
|
// sha1 = shaOrLine;
|
||||||
|
// }
|
||||||
|
// else {
|
||||||
|
// const blame = await this.git.getBlameForLine(this.uri, shaOrLine);
|
||||||
|
// if (blame === undefined) return false;
|
||||||
|
|
||||||
|
// sha1 = blame.commit.previousSha;
|
||||||
|
// sha2 = blame.commit.sha;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// if (sha1 === undefined) return false;
|
||||||
|
|
||||||
|
const commit = await this.git.getLogCommit(this.uri.repoPath, this.uri.fsPath, { previous: true });
|
||||||
|
if (commit === undefined) return false;
|
||||||
|
|
||||||
|
const diff = await this.git.getDiffForFile(this.uri, commit.previousSha);
|
||||||
|
if (diff === undefined) return false;
|
||||||
|
|
||||||
|
const decorators: DecorationOptions[] = [];
|
||||||
|
|
||||||
|
for (const chunk of diff.chunks) {
|
||||||
|
let count = chunk.currentStart - 2;
|
||||||
|
for (const change of chunk.current) {
|
||||||
|
if (change === undefined) continue;
|
||||||
|
|
||||||
|
count++;
|
||||||
|
|
||||||
|
if (change.state === 'unchanged') continue;
|
||||||
|
|
||||||
|
decorators.push({
|
||||||
|
range: new Range(new Position(count, 0), new Position(count, 0))
|
||||||
|
} as DecorationOptions);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.editor.setDecorations(this.decoration, decorators);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
async selection(shaOrLine?: string | number): Promise<void> {
|
||||||
|
}
|
||||||
|
|
||||||
|
async validate(): Promise<boolean> {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,12 +1,11 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { Strings } from '../system';
|
import { Strings } from '../system';
|
||||||
import { DecorationOptions, Range } from 'vscode';
|
import { DecorationOptions, Range } from 'vscode';
|
||||||
import { FileAnnotationType } from './annotationController';
|
|
||||||
import { Annotations } from './annotations';
|
|
||||||
import { BlameAnnotationProviderBase } from './blameAnnotationProvider';
|
import { BlameAnnotationProviderBase } from './blameAnnotationProvider';
|
||||||
import { GlyphChars } from '../constants';
|
import { Annotations, endOfLineIndex } from './annotations';
|
||||||
import { GitBlameCommit, ICommitFormatOptions } from '../gitService';
|
import { FileAnnotationType } from '../configuration';
|
||||||
import { Logger } from '../logger';
|
import { ICommitFormatOptions } from '../gitService';
|
||||||
|
import * as moment from 'moment';
|
||||||
|
|
||||||
export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
|
export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
|
||||||
|
|
||||||
@@ -16,112 +15,59 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
|
|||||||
const blame = await this.getBlame(true);
|
const blame = await this.getBlame(true);
|
||||||
if (blame === undefined) return false;
|
if (blame === undefined) return false;
|
||||||
|
|
||||||
const start = process.hrtime();
|
|
||||||
|
|
||||||
const cfg = this._config.annotations.file.gutter;
|
const cfg = this._config.annotations.file.gutter;
|
||||||
|
|
||||||
// Precalculate the formatting options so we don't need to do it on each iteration
|
// Precalculate the formatting options so we don't need to do it on each iteration
|
||||||
const tokenOptions = Strings.getTokensFromTemplate(cfg.format)
|
const tokenOptions = Strings.getTokensFromTemplate(cfg.format)
|
||||||
.reduce((map, token) => {
|
.reduce((map, token) => {
|
||||||
map[token.key] = token.options as ICommitFormatOptions;
|
map[token.key] = token.options;
|
||||||
return map;
|
return map;
|
||||||
}, {} as { [token: string]: ICommitFormatOptions });
|
}, {} as { [token: string]: ICommitFormatOptions });
|
||||||
|
|
||||||
const options: ICommitFormatOptions = {
|
const options: ICommitFormatOptions = {
|
||||||
dateFormat: cfg.dateFormat === null ? this._config.defaultDateFormat : cfg.dateFormat,
|
dateFormat: cfg.dateFormat,
|
||||||
tokenOptions: tokenOptions
|
tokenOptions: tokenOptions
|
||||||
};
|
};
|
||||||
|
|
||||||
const now = Date.now();
|
const now = moment();
|
||||||
const offset = this.uri.offset;
|
const offset = this.uri.offset;
|
||||||
|
let previousLine: string | undefined = undefined;
|
||||||
const renderOptions = Annotations.gutterRenderOptions(this._config.theme, cfg.heatmap);
|
const renderOptions = Annotations.gutterRenderOptions(this._config.theme, cfg.heatmap);
|
||||||
const separateLines = this._config.theme.annotations.file.gutter.separateLines;
|
|
||||||
|
|
||||||
const decorations: DecorationOptions[] = [];
|
const decorations: DecorationOptions[] = [];
|
||||||
const decorationsMap: { [sha: string]: DecorationOptions | undefined } = Object.create(null);
|
|
||||||
|
|
||||||
let commit: GitBlameCommit | undefined;
|
|
||||||
let compacted = false;
|
|
||||||
let gutter: DecorationOptions | undefined;
|
|
||||||
let previousSha: string | undefined;
|
|
||||||
|
|
||||||
for (const l of blame.lines) {
|
for (const l of blame.lines) {
|
||||||
const line = l.line + offset;
|
const commit = blame.commits.get(l.sha);
|
||||||
|
|
||||||
if (previousSha === l.sha) {
|
|
||||||
// Use a shallow copy of the previous decoration options
|
|
||||||
gutter = { ...gutter } as DecorationOptions;
|
|
||||||
|
|
||||||
if (cfg.compact && !compacted) {
|
|
||||||
// Since we are wiping out the contextText make sure to copy the objects
|
|
||||||
gutter.renderOptions = {
|
|
||||||
...gutter.renderOptions,
|
|
||||||
before: {
|
|
||||||
...gutter.renderOptions!.before,
|
|
||||||
contentText: GlyphChars.Space.repeat(Strings.getWidth(gutter.renderOptions!.before!.contentText!))
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if (separateLines) {
|
|
||||||
gutter.renderOptions.dark = {
|
|
||||||
...gutter.renderOptions.dark,
|
|
||||||
before: { ...gutter.renderOptions.dark!.before, textDecoration: 'none' }
|
|
||||||
};
|
|
||||||
gutter.renderOptions.light = {
|
|
||||||
...gutter.renderOptions.light,
|
|
||||||
before: { ...gutter.renderOptions.light!.before, textDecoration: 'none' }
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
compacted = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
gutter.range = new Range(line, 0, line, 0);
|
|
||||||
|
|
||||||
decorations.push(gutter);
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
compacted = false;
|
|
||||||
previousSha = l.sha;
|
|
||||||
|
|
||||||
gutter = decorationsMap[l.sha];
|
|
||||||
if (gutter !== undefined) {
|
|
||||||
gutter = {
|
|
||||||
...gutter,
|
|
||||||
range: new Range(line, 0, line, 0)
|
|
||||||
} as DecorationOptions;
|
|
||||||
|
|
||||||
decorations.push(gutter);
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
commit = blame.commits.get(l.sha);
|
|
||||||
if (commit === undefined) continue;
|
if (commit === undefined) continue;
|
||||||
|
|
||||||
gutter = Annotations.gutter(commit, cfg.format, options, renderOptions);
|
const line = l.line + offset;
|
||||||
|
|
||||||
|
const gutter = Annotations.gutter(commit, cfg.format, options, renderOptions, cfg.compact && previousLine === l.sha);
|
||||||
|
|
||||||
|
if (cfg.compact) {
|
||||||
|
const isEmptyOrWhitespace = this.document.lineAt(line).isEmptyOrWhitespace;
|
||||||
|
previousLine = isEmptyOrWhitespace ? undefined : l.sha;
|
||||||
|
}
|
||||||
|
|
||||||
if (cfg.heatmap.enabled) {
|
if (cfg.heatmap.enabled) {
|
||||||
Annotations.applyHeatmap(gutter, commit.date, now);
|
Annotations.applyHeatmap(gutter, commit.date, now);
|
||||||
}
|
}
|
||||||
|
|
||||||
gutter.range = new Range(line, 0, line, 0);
|
const firstNonWhitespace = this.editor.document.lineAt(line).firstNonWhitespaceCharacterIndex;
|
||||||
|
gutter.range = this.editor.document.validateRange(new Range(line, 0, line, firstNonWhitespace));
|
||||||
decorations.push(gutter);
|
decorations.push(gutter);
|
||||||
decorationsMap[l.sha] = gutter;
|
|
||||||
|
if (cfg.hover.details) {
|
||||||
|
const details = Annotations.detailsHover(commit);
|
||||||
|
details.range = cfg.hover.wholeLine
|
||||||
|
? this.editor.document.validateRange(new Range(line, 0, line, endOfLineIndex))
|
||||||
|
: gutter.range;
|
||||||
|
decorations.push(details);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (decorations.length) {
|
if (decorations.length) {
|
||||||
this.editor.setDecorations(this.decoration!, decorations);
|
this.editor.setDecorations(this.decoration, decorations);
|
||||||
}
|
|
||||||
|
|
||||||
const duration = process.hrtime(start);
|
|
||||||
Logger.log(`${(duration[0] * 1000) + Math.floor(duration[1] / 1000000)} ms to compute gutter blame annotations`);
|
|
||||||
|
|
||||||
if (cfg.hover.details) {
|
|
||||||
this.registerHoverProvider();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.selection(shaOrLine, blame);
|
this.selection(shaOrLine, blame);
|
||||||
|
|||||||
@@ -1,70 +1,48 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { DecorationOptions, Range } from 'vscode';
|
import { DecorationOptions, Range } from 'vscode';
|
||||||
import { FileAnnotationType } from './annotationController';
|
|
||||||
import { Annotations } from './annotations';
|
|
||||||
import { BlameAnnotationProviderBase } from './blameAnnotationProvider';
|
import { BlameAnnotationProviderBase } from './blameAnnotationProvider';
|
||||||
import { GitBlameCommit } from '../gitService';
|
import { Annotations, endOfLineIndex } from './annotations';
|
||||||
import { Logger } from '../logger';
|
import { FileAnnotationType } from '../configuration';
|
||||||
|
import * as moment from 'moment';
|
||||||
|
|
||||||
export class HoverBlameAnnotationProvider extends BlameAnnotationProviderBase {
|
export class HoverBlameAnnotationProvider extends BlameAnnotationProviderBase {
|
||||||
|
|
||||||
async provideAnnotation(shaOrLine?: string | number): Promise<boolean> {
|
async provideAnnotation(shaOrLine?: string | number): Promise<boolean> {
|
||||||
this.annotationType = FileAnnotationType.Hover;
|
this.annotationType = FileAnnotationType.Hover;
|
||||||
|
|
||||||
const cfg = this._config.annotations.file.hover;
|
const blame = await this.getBlame(this._config.annotations.file.hover.heatmap.enabled);
|
||||||
|
|
||||||
const blame = await this.getBlame(cfg.heatmap.enabled);
|
|
||||||
if (blame === undefined) return false;
|
if (blame === undefined) return false;
|
||||||
|
|
||||||
if (cfg.heatmap.enabled) {
|
const cfg = this._config.annotations.file.hover;
|
||||||
const start = process.hrtime();
|
|
||||||
|
|
||||||
const now = Date.now();
|
const now = moment();
|
||||||
const offset = this.uri.offset;
|
const offset = this.uri.offset;
|
||||||
const renderOptions = Annotations.hoverRenderOptions(this._config.theme, cfg.heatmap);
|
const renderOptions = Annotations.hoverRenderOptions(this._config.theme, cfg.heatmap);
|
||||||
|
|
||||||
const decorations: DecorationOptions[] = [];
|
const decorations: DecorationOptions[] = [];
|
||||||
const decorationsMap: { [sha: string]: DecorationOptions } = Object.create(null);
|
|
||||||
|
|
||||||
let commit: GitBlameCommit | undefined;
|
for (const l of blame.lines) {
|
||||||
let hover: DecorationOptions | undefined;
|
const commit = blame.commits.get(l.sha);
|
||||||
|
if (commit === undefined) continue;
|
||||||
|
|
||||||
for (const l of blame.lines) {
|
const line = l.line + offset;
|
||||||
const line = l.line + offset;
|
|
||||||
|
|
||||||
hover = decorationsMap[l.sha];
|
const hover = Annotations.hover(commit, renderOptions, cfg.heatmap.enabled);
|
||||||
|
|
||||||
if (hover !== undefined) {
|
const endIndex = cfg.wholeLine ? endOfLineIndex : this.editor.document.lineAt(line).firstNonWhitespaceCharacterIndex;
|
||||||
hover = {
|
hover.range = this.editor.document.validateRange(new Range(line, 0, line, endIndex));
|
||||||
...hover,
|
|
||||||
range: new Range(line, 0, line, 0)
|
|
||||||
} as DecorationOptions;
|
|
||||||
|
|
||||||
decorations.push(hover);
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
commit = blame.commits.get(l.sha);
|
|
||||||
if (commit === undefined) continue;
|
|
||||||
|
|
||||||
hover = Annotations.hover(commit, renderOptions, now);
|
|
||||||
hover.range = new Range(line, 0, line, 0);
|
|
||||||
|
|
||||||
decorations.push(hover);
|
|
||||||
decorationsMap[l.sha] = hover;
|
|
||||||
|
|
||||||
|
if (cfg.heatmap.enabled) {
|
||||||
|
Annotations.applyHeatmap(hover, commit.date, now);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (decorations.length) {
|
decorations.push(hover);
|
||||||
this.editor.setDecorations(this.decoration!, decorations);
|
}
|
||||||
}
|
|
||||||
|
if (decorations.length) {
|
||||||
const duration = process.hrtime(start);
|
this.editor.setDecorations(this.decoration, decorations);
|
||||||
Logger.log(`${(duration[0] * 1000) + Math.floor(duration[1] / 1000000)} ms to compute hover blame annotations`);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.registerHoverProvider();
|
|
||||||
this.selection(shaOrLine, blame);
|
this.selection(shaOrLine, blame);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,75 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
import { DecorationOptions, ExtensionContext, MarkdownString, Position, Range, TextEditor, TextEditorDecorationType } from 'vscode';
|
|
||||||
import { Annotations, endOfLineIndex } from './annotations';
|
|
||||||
import { FileAnnotationType } from './annotationController';
|
|
||||||
import { AnnotationProviderBase } from './annotationProvider';
|
|
||||||
import { GitService, GitUri } from '../gitService';
|
|
||||||
import { Logger } from '../logger';
|
|
||||||
|
|
||||||
export class RecentChangesAnnotationProvider extends AnnotationProviderBase {
|
|
||||||
|
|
||||||
constructor(context: ExtensionContext, editor: TextEditor, decoration: TextEditorDecorationType | undefined, highlightDecoration: TextEditorDecorationType | undefined, private git: GitService, private uri: GitUri) {
|
|
||||||
super(context, editor, decoration, highlightDecoration, undefined);
|
|
||||||
}
|
|
||||||
|
|
||||||
async provideAnnotation(shaOrLine?: string | number): Promise<boolean> {
|
|
||||||
this.annotationType = FileAnnotationType.RecentChanges;
|
|
||||||
|
|
||||||
const commit = await this.git.getLogCommit(this.uri.repoPath, this.uri.fsPath, { previous: true });
|
|
||||||
if (commit === undefined) return false;
|
|
||||||
|
|
||||||
const diff = await this.git.getDiffForFile(this.uri, commit.previousSha);
|
|
||||||
if (diff === undefined) return false;
|
|
||||||
|
|
||||||
const start = process.hrtime();
|
|
||||||
|
|
||||||
const cfg = this._config.annotations.file.recentChanges;
|
|
||||||
const dateFormat = this._config.defaultDateFormat;
|
|
||||||
|
|
||||||
const decorators: DecorationOptions[] = [];
|
|
||||||
|
|
||||||
for (const chunk of diff.chunks) {
|
|
||||||
let count = chunk.currentPosition.start - 2;
|
|
||||||
for (const line of chunk.lines) {
|
|
||||||
if (line.line === undefined) continue;
|
|
||||||
|
|
||||||
count++;
|
|
||||||
|
|
||||||
if (line.state === 'unchanged') continue;
|
|
||||||
|
|
||||||
const range = this.editor.document.validateRange(new Range(new Position(count, 0), new Position(count, endOfLineIndex)));
|
|
||||||
|
|
||||||
if (cfg.hover.details) {
|
|
||||||
decorators.push({
|
|
||||||
hoverMessage: Annotations.getHoverMessage(commit, dateFormat, this.git.hasRemotes(commit.repoPath)),
|
|
||||||
range: range
|
|
||||||
} as DecorationOptions);
|
|
||||||
}
|
|
||||||
|
|
||||||
let message: MarkdownString | undefined = undefined;
|
|
||||||
if (cfg.hover.changes) {
|
|
||||||
message = Annotations.getHoverDiffMessage(commit, line);
|
|
||||||
}
|
|
||||||
|
|
||||||
decorators.push({
|
|
||||||
hoverMessage: message,
|
|
||||||
range: range
|
|
||||||
} as DecorationOptions);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.editor.setDecorations(this.highlightDecoration!, decorators);
|
|
||||||
|
|
||||||
const duration = process.hrtime(start);
|
|
||||||
Logger.log(`${(duration[0] * 1000) + Math.floor(duration[1] / 1000000)} ms to compute recent changes annotations`);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async selection(shaOrLine?: string | number): Promise<void> {
|
|
||||||
}
|
|
||||||
|
|
||||||
async validate(): Promise<boolean> {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
import { Objects } from './system';
|
|
||||||
import { Disposable, ExtensionContext, languages, TextEditor, workspace } from 'vscode';
|
|
||||||
import { IConfig } from './configuration';
|
|
||||||
import { CommandContext, ExtensionKey, setCommandContext } from './constants';
|
|
||||||
import { GitCodeLensProvider } from './gitCodeLensProvider';
|
|
||||||
import { GitService } from './gitService';
|
|
||||||
import { Logger } from './logger';
|
|
||||||
|
|
||||||
export class CodeLensController extends Disposable {
|
|
||||||
|
|
||||||
private _codeLensProvider: GitCodeLensProvider | undefined;
|
|
||||||
private _codeLensProviderDisposable: Disposable | undefined;
|
|
||||||
private _config: IConfig;
|
|
||||||
private _disposable: Disposable | undefined;
|
|
||||||
|
|
||||||
constructor(private context: ExtensionContext, private git: GitService) {
|
|
||||||
super(() => this.dispose());
|
|
||||||
|
|
||||||
this._onConfigurationChanged();
|
|
||||||
|
|
||||||
const subscriptions: Disposable[] = [];
|
|
||||||
|
|
||||||
subscriptions.push(workspace.onDidChangeConfiguration(this._onConfigurationChanged, this));
|
|
||||||
subscriptions.push(git.onDidChangeGitCache(this._onGitCacheChanged, this));
|
|
||||||
|
|
||||||
this._disposable = Disposable.from(...subscriptions);
|
|
||||||
}
|
|
||||||
|
|
||||||
dispose() {
|
|
||||||
this._disposable && this._disposable.dispose();
|
|
||||||
|
|
||||||
this._codeLensProviderDisposable && this._codeLensProviderDisposable.dispose();
|
|
||||||
this._codeLensProviderDisposable = undefined;
|
|
||||||
this._codeLensProvider = undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
private _onConfigurationChanged() {
|
|
||||||
const cfg = workspace.getConfiguration().get<IConfig>(ExtensionKey)!;
|
|
||||||
|
|
||||||
if (!Objects.areEquivalent(cfg.codeLens, this._config && this._config.codeLens)) {
|
|
||||||
Logger.log('CodeLens config changed; resetting CodeLens provider');
|
|
||||||
if (cfg.codeLens.enabled && (cfg.codeLens.recentChange.enabled || cfg.codeLens.authors.enabled)) {
|
|
||||||
if (this._codeLensProvider) {
|
|
||||||
this._codeLensProvider.reset();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
this._codeLensProvider = new GitCodeLensProvider(this.context, this.git);
|
|
||||||
this._codeLensProviderDisposable = languages.registerCodeLensProvider(GitCodeLensProvider.selector, this._codeLensProvider);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
this._codeLensProviderDisposable && this._codeLensProviderDisposable.dispose();
|
|
||||||
this._codeLensProviderDisposable = undefined;
|
|
||||||
this._codeLensProvider = undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
setCommandContext(CommandContext.CanToggleCodeLens, cfg.codeLens.recentChange.enabled || cfg.codeLens.authors.enabled);
|
|
||||||
}
|
|
||||||
|
|
||||||
this._config = cfg;
|
|
||||||
}
|
|
||||||
|
|
||||||
private _onGitCacheChanged() {
|
|
||||||
Logger.log('Git cache changed; resetting CodeLens provider');
|
|
||||||
this._codeLensProvider && this._codeLensProvider.reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleCodeLens(editor: TextEditor) {
|
|
||||||
if (!this._config.codeLens.recentChange.enabled && !this._config.codeLens.authors.enabled) return;
|
|
||||||
|
|
||||||
Logger.log(`toggleCodeLens()`);
|
|
||||||
if (this._codeLensProviderDisposable) {
|
|
||||||
this._codeLensProviderDisposable.dispose();
|
|
||||||
this._codeLensProviderDisposable = undefined;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this._codeLensProviderDisposable = languages.registerCodeLensProvider(GitCodeLensProvider.selector, new GitCodeLensProvider(this.context, this.git));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +1,35 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
export * from './commands/common';
|
export * from './commands/common';
|
||||||
|
|
||||||
export * from './commands/clearFileAnnotations';
|
export * from './commands/keyboard';
|
||||||
|
|
||||||
export * from './commands/closeUnchangedFiles';
|
export * from './commands/closeUnchangedFiles';
|
||||||
export * from './commands/copyMessageToClipboard';
|
export * from './commands/copyMessageToClipboard';
|
||||||
export * from './commands/copyShaToClipboard';
|
export * from './commands/copyShaToClipboard';
|
||||||
export * from './commands/diffDirectory';
|
export * from './commands/diffDirectory';
|
||||||
export * from './commands/diffLineWithPrevious';
|
export * from './commands/diffLineWithPrevious';
|
||||||
export * from './commands/diffLineWithWorking';
|
export * from './commands/diffLineWithWorking';
|
||||||
export * from './commands/diffWith';
|
|
||||||
export * from './commands/diffWithBranch';
|
export * from './commands/diffWithBranch';
|
||||||
export * from './commands/diffWithNext';
|
export * from './commands/diffWithNext';
|
||||||
export * from './commands/diffWithPrevious';
|
export * from './commands/diffWithPrevious';
|
||||||
export * from './commands/diffWithRevision';
|
|
||||||
export * from './commands/diffWithWorking';
|
export * from './commands/diffWithWorking';
|
||||||
export * from './commands/openChangedFiles';
|
export * from './commands/openChangedFiles';
|
||||||
export * from './commands/openBranchesInRemote';
|
|
||||||
export * from './commands/openBranchInRemote';
|
export * from './commands/openBranchInRemote';
|
||||||
export * from './commands/openCommitInRemote';
|
export * from './commands/openCommitInRemote';
|
||||||
export * from './commands/openFileInRemote';
|
export * from './commands/openFileInRemote';
|
||||||
export * from './commands/openInRemote';
|
export * from './commands/openInRemote';
|
||||||
export * from './commands/openRepoInRemote';
|
export * from './commands/openRepoInRemote';
|
||||||
export * from './commands/resetSuppressedWarnings';
|
|
||||||
export * from './commands/showBlameHistory';
|
export * from './commands/showBlameHistory';
|
||||||
export * from './commands/showCommitSearch';
|
|
||||||
export * from './commands/showFileBlame';
|
export * from './commands/showFileBlame';
|
||||||
export * from './commands/showFileHistory';
|
export * from './commands/showFileHistory';
|
||||||
export * from './commands/showLastQuickPick';
|
export * from './commands/showLastQuickPick';
|
||||||
export * from './commands/showLineBlame';
|
export * from './commands/showLineBlame';
|
||||||
export * from './commands/showQuickBranchHistory';
|
|
||||||
export * from './commands/showQuickCommitDetails';
|
export * from './commands/showQuickCommitDetails';
|
||||||
export * from './commands/showQuickCommitFileDetails';
|
export * from './commands/showQuickCommitFileDetails';
|
||||||
export * from './commands/showQuickCurrentBranchHistory';
|
export * from './commands/showCommitSearch';
|
||||||
export * from './commands/showQuickFileHistory';
|
export * from './commands/showQuickFileHistory';
|
||||||
|
export * from './commands/showQuickBranchHistory';
|
||||||
|
export * from './commands/showQuickCurrentBranchHistory';
|
||||||
export * from './commands/showQuickRepoStatus';
|
export * from './commands/showQuickRepoStatus';
|
||||||
export * from './commands/showQuickStashList';
|
export * from './commands/showQuickStashList';
|
||||||
export * from './commands/stashApply';
|
export * from './commands/stashApply';
|
||||||
@@ -40,5 +37,4 @@ export * from './commands/stashDelete';
|
|||||||
export * from './commands/stashSave';
|
export * from './commands/stashSave';
|
||||||
export * from './commands/toggleCodeLens';
|
export * from './commands/toggleCodeLens';
|
||||||
export * from './commands/toggleFileBlame';
|
export * from './commands/toggleFileBlame';
|
||||||
export * from './commands/toggleFileRecentChanges';
|
|
||||||
export * from './commands/toggleLineBlame';
|
export * from './commands/toggleLineBlame';
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
import { TextEditor, TextEditorEdit, Uri, window } from 'vscode';
|
|
||||||
import { AnnotationController } from '../annotations/annotationController';
|
|
||||||
import { Commands, EditorCommand } from './common';
|
|
||||||
import { Logger } from '../logger';
|
|
||||||
|
|
||||||
export class ClearFileAnnotationsCommand extends EditorCommand {
|
|
||||||
|
|
||||||
constructor(private annotationController: AnnotationController) {
|
|
||||||
super(Commands.ClearFileAnnotations);
|
|
||||||
}
|
|
||||||
|
|
||||||
async execute(editor: TextEditor, edit: TextEditorEdit, uri?: Uri): Promise<any> {
|
|
||||||
if (editor === undefined || editor.document === undefined || editor.document.isDirty) return undefined;
|
|
||||||
|
|
||||||
try {
|
|
||||||
return this.annotationController.clear(editor.viewColumn || -1);
|
|
||||||
}
|
|
||||||
catch (ex) {
|
|
||||||
Logger.error(ex, 'ClearFileAnnotationsCommand');
|
|
||||||
return window.showErrorMessage(`Unable to clear file annotations. See output channel for more details`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,87 +1,71 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { commands, TextEditor, Uri, window } from 'vscode';
|
import { TextEditor, Uri, window } from 'vscode';
|
||||||
import { ActiveEditorTracker } from '../activeEditorTracker';
|
import { ActiveEditorTracker } from '../activeEditorTracker';
|
||||||
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
||||||
import { TextEditorComparer, UriComparer } from '../comparers';
|
import { TextEditorComparer, UriComparer } from '../comparers';
|
||||||
import { BuiltInCommands } from '../constants';
|
import { GitService } from '../gitService';
|
||||||
import { GitService } from '../gitService';
|
import { Logger } from '../logger';
|
||||||
import { Logger } from '../logger';
|
|
||||||
import { Messages } from '../messages';
|
export interface CloseUnchangedFilesCommandArgs {
|
||||||
|
uris?: Uri[];
|
||||||
export interface CloseUnchangedFilesCommandArgs {
|
}
|
||||||
uris?: Uri[];
|
|
||||||
}
|
export class CloseUnchangedFilesCommand extends ActiveEditorCommand {
|
||||||
|
|
||||||
export class CloseUnchangedFilesCommand extends ActiveEditorCommand {
|
constructor(private git: GitService) {
|
||||||
|
super(Commands.CloseUnchangedFiles);
|
||||||
constructor(private git: GitService) {
|
}
|
||||||
super(Commands.CloseUnchangedFiles);
|
|
||||||
}
|
async execute(editor: TextEditor, uri?: Uri, args: CloseUnchangedFilesCommandArgs = {}) {
|
||||||
|
uri = getCommandUri(uri, editor);
|
||||||
async execute(editor?: TextEditor, uri?: Uri, args: CloseUnchangedFilesCommandArgs = {}) {
|
|
||||||
uri = getCommandUri(uri, editor);
|
try {
|
||||||
|
if (args.uris === undefined) {
|
||||||
try {
|
const repoPath = await this.git.getRepoPathFromUri(uri);
|
||||||
if (args.uris === undefined) {
|
if (!repoPath) return window.showWarningMessage(`Unable to close unchanged files`);
|
||||||
args = { ...args };
|
|
||||||
|
const status = await this.git.getStatusForRepo(repoPath);
|
||||||
const repoPath = await this.git.getRepoPathFromUri(uri);
|
if (status === undefined) return window.showWarningMessage(`Unable to close unchanged files`);
|
||||||
if (!repoPath) return Messages.showNoRepositoryWarningMessage(`Unable to close unchanged files`);
|
|
||||||
|
args.uris = status.files.map(_ => _.Uri);
|
||||||
const status = await this.git.getStatusForRepo(repoPath);
|
}
|
||||||
if (status === undefined) return window.showWarningMessage(`Unable to close unchanged files`);
|
|
||||||
|
const editorTracker = new ActiveEditorTracker();
|
||||||
args.uris = status.files.map(_ => _.Uri);
|
|
||||||
}
|
let active = window.activeTextEditor;
|
||||||
|
let editor = active;
|
||||||
if (args.uris.length === 0) return commands.executeCommand(BuiltInCommands.CloseAllEditors);
|
do {
|
||||||
|
if (editor !== undefined) {
|
||||||
const editorTracker = new ActiveEditorTracker();
|
if ((editor.document !== undefined && editor.document.isDirty) ||
|
||||||
|
args.uris.some(_ => UriComparer.equals(_, editor!.document && editor!.document.uri))) {
|
||||||
let count = 0;
|
// If we didn't start with a valid editor, set one once we find it
|
||||||
let previous = undefined;
|
if (active === undefined) {
|
||||||
let editor = window.activeTextEditor;
|
active = editor;
|
||||||
while (true) {
|
}
|
||||||
if (editor !== undefined) {
|
editor = await editorTracker.awaitNext(500);
|
||||||
if (TextEditorComparer.equals(previous, editor, { useId: true, usePosition: true })) {
|
}
|
||||||
break;
|
else {
|
||||||
}
|
if (active === editor) {
|
||||||
|
active = undefined;
|
||||||
if (editor.document !== undefined &&
|
}
|
||||||
(editor.document.isDirty || args.uris.some(_ => UriComparer.equals(_, editor!.document && editor!.document.uri)))) {
|
editor = await editorTracker.awaitClose(500);
|
||||||
const lastPrevious = previous;
|
}
|
||||||
previous = editor;
|
}
|
||||||
editor = await editorTracker.awaitNext(500);
|
else {
|
||||||
|
if (active === editor) {
|
||||||
if (TextEditorComparer.equals(lastPrevious, editor, { useId: true, usePosition: true })) {
|
active = undefined;
|
||||||
break;
|
}
|
||||||
}
|
editor = await editorTracker.awaitClose(500);
|
||||||
continue;
|
}
|
||||||
}
|
} while ((active === undefined && editor === undefined) || !TextEditorComparer.equals(active, editor, { useId: true, usePosition: true }));
|
||||||
}
|
|
||||||
|
editorTracker.dispose();
|
||||||
previous = editor;
|
|
||||||
editor = await editorTracker.awaitClose(500);
|
return undefined;
|
||||||
|
}
|
||||||
if (previous === undefined && editor === undefined) {
|
catch (ex) {
|
||||||
count++;
|
Logger.error(ex, 'CloseUnchangedFilesCommand');
|
||||||
// This is such a shitty hack, but I can't figure out any other reliable way to know that we've cycled through all the editors :(
|
return window.showErrorMessage(`Unable to close unchanged files. See output channel for more details`);
|
||||||
if (count >= 4) {
|
}
|
||||||
break;
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
count = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
editorTracker.dispose();
|
|
||||||
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
catch (ex) {
|
|
||||||
Logger.error(ex, 'CloseUnchangedFilesCommand');
|
|
||||||
return window.showErrorMessage(`Unable to close unchanged files. See output channel for more details`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,80 +1,42 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { commands, Disposable, SourceControlResourceGroup, SourceControlResourceState, TextDocumentShowOptions, TextEditor, TextEditorEdit, Uri, window, workspace } from 'vscode';
|
import { commands, Disposable, TextDocumentShowOptions, TextEditor, TextEditorEdit, Uri, window, workspace } from 'vscode';
|
||||||
import { ExplorerNode } from '../views/explorerNodes';
|
import { BuiltInCommands } from '../constants';
|
||||||
import { GitBranch, GitCommit, GitRemote } from '../gitService';
|
|
||||||
import { Logger } from '../logger';
|
import { Logger } from '../logger';
|
||||||
import { Telemetry } from '../telemetry';
|
import { Telemetry } from '../telemetry';
|
||||||
|
|
||||||
export type Commands =
|
export type Commands = 'gitlens.closeUnchangedFiles' | 'gitlens.copyMessageToClipboard' | 'gitlens.copyShaToClipboard' |
|
||||||
'gitlens.clearFileAnnotations' |
|
'gitlens.diffDirectory' | 'gitlens.diffWithBranch' | 'gitlens.diffWithNext' | 'gitlens.diffWithPrevious' | 'gitlens.diffLineWithPrevious' | 'gitlens.diffWithWorking' | 'gitlens.diffLineWithWorking' |
|
||||||
'gitlens.closeUnchangedFiles' |
|
'gitlens.openChangedFiles' | 'gitlens.openBranchInRemote' | 'gitlens.openCommitInRemote' | 'gitlens.openFileInRemote' | 'gitlens.openInRemote' | 'gitlens.openRepoInRemote' |
|
||||||
'gitlens.copyMessageToClipboard' |
|
'gitlens.showBlameHistory' | 'gitlens.showCommitSearch' | 'gitlens.showFileBlame' | 'gitlens.showFileHistory' |
|
||||||
'gitlens.copyShaToClipboard' |
|
'gitlens.showLastQuickPick' | 'gitlens.showLineBlame' | 'gitlens.showQuickBranchHistory' |
|
||||||
'gitlens.diffDirectory' |
|
'gitlens.showQuickCommitDetails' | 'gitlens.showQuickCommitFileDetails' |
|
||||||
'gitlens.diffWith' |
|
'gitlens.showQuickFileHistory' | 'gitlens.showQuickRepoHistory' |
|
||||||
'gitlens.diffWithBranch' |
|
'gitlens.showQuickRepoStatus' | 'gitlens.showQuickStashList' |
|
||||||
'gitlens.diffWithNext' |
|
'gitlens.stashApply' | 'gitlens.stashDelete' | 'gitlens.stashSave' |
|
||||||
'gitlens.diffWithPrevious' |
|
'gitlens.toggleCodeLens' | 'gitlens.toggleFileBlame' | 'gitlens.toggleLineBlame';
|
||||||
'gitlens.diffLineWithPrevious' |
|
|
||||||
'gitlens.diffWithRevision' |
|
|
||||||
'gitlens.diffWithWorking' |
|
|
||||||
'gitlens.diffLineWithWorking' |
|
|
||||||
'gitlens.openChangedFiles' |
|
|
||||||
'gitlens.openBranchesInRemote' |
|
|
||||||
'gitlens.openBranchInRemote' |
|
|
||||||
'gitlens.openCommitInRemote' |
|
|
||||||
'gitlens.openFileInRemote' |
|
|
||||||
'gitlens.openInRemote' |
|
|
||||||
'gitlens.openRepoInRemote' |
|
|
||||||
'gitlens.resetSuppressedWarnings' |
|
|
||||||
'gitlens.showBlameHistory' |
|
|
||||||
'gitlens.showCommitSearch' |
|
|
||||||
'gitlens.showFileBlame' |
|
|
||||||
'gitlens.showFileHistory' |
|
|
||||||
'gitlens.showLastQuickPick' |
|
|
||||||
'gitlens.showLineBlame' |
|
|
||||||
'gitlens.showQuickBranchHistory' |
|
|
||||||
'gitlens.showQuickCommitDetails' |
|
|
||||||
'gitlens.showQuickCommitFileDetails' |
|
|
||||||
'gitlens.showQuickFileHistory' |
|
|
||||||
'gitlens.showQuickRepoHistory' |
|
|
||||||
'gitlens.showQuickRepoStatus' |
|
|
||||||
'gitlens.showQuickStashList' |
|
|
||||||
'gitlens.stashApply' |
|
|
||||||
'gitlens.stashDelete' |
|
|
||||||
'gitlens.stashSave' |
|
|
||||||
'gitlens.toggleCodeLens' |
|
|
||||||
'gitlens.toggleFileBlame' |
|
|
||||||
'gitlens.toggleFileRecentChanges' |
|
|
||||||
'gitlens.toggleLineBlame';
|
|
||||||
export const Commands = {
|
export const Commands = {
|
||||||
ClearFileAnnotations: 'gitlens.clearFileAnnotations' as Commands,
|
|
||||||
CloseUnchangedFiles: 'gitlens.closeUnchangedFiles' as Commands,
|
CloseUnchangedFiles: 'gitlens.closeUnchangedFiles' as Commands,
|
||||||
CopyMessageToClipboard: 'gitlens.copyMessageToClipboard' as Commands,
|
CopyMessageToClipboard: 'gitlens.copyMessageToClipboard' as Commands,
|
||||||
CopyShaToClipboard: 'gitlens.copyShaToClipboard' as Commands,
|
CopyShaToClipboard: 'gitlens.copyShaToClipboard' as Commands,
|
||||||
DiffDirectory: 'gitlens.diffDirectory' as Commands,
|
DiffDirectory: 'gitlens.diffDirectory' as Commands,
|
||||||
DiffWith: 'gitlens.diffWith' as Commands,
|
|
||||||
DiffWithBranch: 'gitlens.diffWithBranch' as Commands,
|
DiffWithBranch: 'gitlens.diffWithBranch' as Commands,
|
||||||
DiffWithNext: 'gitlens.diffWithNext' as Commands,
|
DiffWithNext: 'gitlens.diffWithNext' as Commands,
|
||||||
DiffWithPrevious: 'gitlens.diffWithPrevious' as Commands,
|
DiffWithPrevious: 'gitlens.diffWithPrevious' as Commands,
|
||||||
DiffLineWithPrevious: 'gitlens.diffLineWithPrevious' as Commands,
|
DiffLineWithPrevious: 'gitlens.diffLineWithPrevious' as Commands,
|
||||||
DiffWithRevision: 'gitlens.diffWithRevision' as Commands,
|
|
||||||
DiffWithWorking: 'gitlens.diffWithWorking' as Commands,
|
DiffWithWorking: 'gitlens.diffWithWorking' as Commands,
|
||||||
DiffLineWithWorking: 'gitlens.diffLineWithWorking' as Commands,
|
DiffLineWithWorking: 'gitlens.diffLineWithWorking' as Commands,
|
||||||
OpenChangedFiles: 'gitlens.openChangedFiles' as Commands,
|
OpenChangedFiles: 'gitlens.openChangedFiles' as Commands,
|
||||||
OpenBranchesInRemote: 'gitlens.openBranchesInRemote' as Commands,
|
|
||||||
OpenBranchInRemote: 'gitlens.openBranchInRemote' as Commands,
|
OpenBranchInRemote: 'gitlens.openBranchInRemote' as Commands,
|
||||||
OpenCommitInRemote: 'gitlens.openCommitInRemote' as Commands,
|
OpenCommitInRemote: 'gitlens.openCommitInRemote' as Commands,
|
||||||
OpenFileInRemote: 'gitlens.openFileInRemote' as Commands,
|
OpenFileInRemote: 'gitlens.openFileInRemote' as Commands,
|
||||||
OpenInRemote: 'gitlens.openInRemote' as Commands,
|
OpenInRemote: 'gitlens.openInRemote' as Commands,
|
||||||
OpenRepoInRemote: 'gitlens.openRepoInRemote' as Commands,
|
OpenRepoInRemote: 'gitlens.openRepoInRemote' as Commands,
|
||||||
ResetSuppressedWarnings: 'gitlens.resetSuppressedWarnings' as Commands,
|
ShowFileBlame: 'gitlens.showFileBlame' as Commands,
|
||||||
|
ShowLineBlame: 'gitlens.showLineBlame' as Commands,
|
||||||
ShowBlameHistory: 'gitlens.showBlameHistory' as Commands,
|
ShowBlameHistory: 'gitlens.showBlameHistory' as Commands,
|
||||||
ShowCommitSearch: 'gitlens.showCommitSearch' as Commands,
|
ShowCommitSearch: 'gitlens.showCommitSearch' as Commands,
|
||||||
ShowFileBlame: 'gitlens.showFileBlame' as Commands,
|
|
||||||
ShowFileHistory: 'gitlens.showFileHistory' as Commands,
|
ShowFileHistory: 'gitlens.showFileHistory' as Commands,
|
||||||
ShowLastQuickPick: 'gitlens.showLastQuickPick' as Commands,
|
ShowLastQuickPick: 'gitlens.showLastQuickPick' as Commands,
|
||||||
ShowLineBlame: 'gitlens.showLineBlame' as Commands,
|
|
||||||
ShowQuickCommitDetails: 'gitlens.showQuickCommitDetails' as Commands,
|
ShowQuickCommitDetails: 'gitlens.showQuickCommitDetails' as Commands,
|
||||||
ShowQuickCommitFileDetails: 'gitlens.showQuickCommitFileDetails' as Commands,
|
ShowQuickCommitFileDetails: 'gitlens.showQuickCommitFileDetails' as Commands,
|
||||||
ShowQuickFileHistory: 'gitlens.showQuickFileHistory' as Commands,
|
ShowQuickFileHistory: 'gitlens.showQuickFileHistory' as Commands,
|
||||||
@@ -85,10 +47,9 @@ export const Commands = {
|
|||||||
StashApply: 'gitlens.stashApply' as Commands,
|
StashApply: 'gitlens.stashApply' as Commands,
|
||||||
StashDelete: 'gitlens.stashDelete' as Commands,
|
StashDelete: 'gitlens.stashDelete' as Commands,
|
||||||
StashSave: 'gitlens.stashSave' as Commands,
|
StashSave: 'gitlens.stashSave' as Commands,
|
||||||
ToggleCodeLens: 'gitlens.toggleCodeLens' as Commands,
|
|
||||||
ToggleFileBlame: 'gitlens.toggleFileBlame' as Commands,
|
ToggleFileBlame: 'gitlens.toggleFileBlame' as Commands,
|
||||||
ToggleFileRecentChanges: 'gitlens.toggleFileRecentChanges' as Commands,
|
ToggleLineBlame: 'gitlens.toggleLineBlame' as Commands,
|
||||||
ToggleLineBlame: 'gitlens.toggleLineBlame' as Commands
|
ToggleCodeLens: 'gitlens.toggleCodeLens' as Commands
|
||||||
};
|
};
|
||||||
|
|
||||||
export function getCommandUri(uri?: Uri, editor?: TextEditor): Uri | undefined {
|
export function getCommandUri(uri?: Uri, editor?: TextEditor): Uri | undefined {
|
||||||
@@ -97,88 +58,27 @@ export function getCommandUri(uri?: Uri, editor?: TextEditor): Uri | undefined {
|
|||||||
return editor.document.uri;
|
return editor.document.uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CommandContextParsingOptions {
|
export type CommandContext = 'gitlens:canToggleCodeLens' | 'gitlens:enabled' | 'gitlens:hasRemotes' | 'gitlens:isBlameable' | 'gitlens:isRepository' | 'gitlens:isTracked' | 'gitlens:key';
|
||||||
editor: boolean;
|
export const CommandContext = {
|
||||||
uri: boolean;
|
CanToggleCodeLens: 'gitlens:canToggleCodeLens' as CommandContext,
|
||||||
}
|
Enabled: 'gitlens:enabled' as CommandContext,
|
||||||
|
HasRemotes: 'gitlens:hasRemotes' as CommandContext,
|
||||||
|
IsBlameable: 'gitlens:isBlameable' as CommandContext,
|
||||||
|
IsRepository: 'gitlens:isRepository' as CommandContext,
|
||||||
|
IsTracked: 'gitlens:isTracked' as CommandContext,
|
||||||
|
Key: 'gitlens:key' as CommandContext
|
||||||
|
};
|
||||||
|
|
||||||
export interface CommandBaseContext {
|
export function setCommandContext(key: CommandContext | string, value: any) {
|
||||||
editor?: TextEditor;
|
return commands.executeCommand(BuiltInCommands.SetContext, key, value);
|
||||||
uri?: Uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CommandScmGroupsContext extends CommandBaseContext {
|
|
||||||
type: 'scm-groups';
|
|
||||||
scmResourceGroups: SourceControlResourceGroup[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CommandScmStatesContext extends CommandBaseContext {
|
|
||||||
type: 'scm-states';
|
|
||||||
scmResourceStates: SourceControlResourceState[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CommandUnknownContext extends CommandBaseContext {
|
|
||||||
type: 'unknown';
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CommandUriContext extends CommandBaseContext {
|
|
||||||
type: 'uri';
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CommandViewContext extends CommandBaseContext {
|
|
||||||
type: 'view';
|
|
||||||
node: ExplorerNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isCommandViewContextWithBranch(context: CommandContext): context is CommandViewContext & { node: (ExplorerNode & { branch: GitBranch }) } {
|
|
||||||
return context.type === 'view' && (context.node as any).branch && (context.node as any).branch instanceof GitBranch;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ICommandViewContextWithCommit<T extends GitCommit> extends CommandViewContext {
|
|
||||||
node: (ExplorerNode & { commit: T });
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isCommandViewContextWithCommit<T extends GitCommit>(context: CommandContext): context is ICommandViewContextWithCommit<T> {
|
|
||||||
return context.type === 'view' && (context.node as any).commit && (context.node as any).commit instanceof GitCommit;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isCommandViewContextWithRemote(context: CommandContext): context is CommandViewContext & { node: (ExplorerNode & { remote: GitRemote }) } {
|
|
||||||
return context.type === 'view' && (context.node as any).remote && (context.node as any).remote instanceof GitRemote;
|
|
||||||
}
|
|
||||||
|
|
||||||
export type CommandContext = CommandScmGroupsContext | CommandScmStatesContext | CommandUnknownContext | CommandUriContext | CommandViewContext;
|
|
||||||
|
|
||||||
function isScmResourceGroup(group: any): group is SourceControlResourceGroup {
|
|
||||||
if (group === undefined) return false;
|
|
||||||
|
|
||||||
return (group as SourceControlResourceGroup).id !== undefined && (group.handle !== undefined || (group as SourceControlResourceGroup).label !== undefined || (group as SourceControlResourceGroup).resourceStates !== undefined);
|
|
||||||
}
|
|
||||||
|
|
||||||
function isScmResourceState(state: any): state is SourceControlResourceState {
|
|
||||||
if (state === undefined) return false;
|
|
||||||
|
|
||||||
return (state as SourceControlResourceState).resourceUri !== undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isTextEditor(editor: any): editor is TextEditor {
|
|
||||||
if (editor === undefined) return false;
|
|
||||||
|
|
||||||
return editor.id !== undefined && ((editor as TextEditor).edit !== undefined || (editor as TextEditor).document !== undefined);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export abstract class Command extends Disposable {
|
export abstract class Command extends Disposable {
|
||||||
|
|
||||||
static getMarkdownCommandArgsCore<T>(command: Commands, args: T): string {
|
|
||||||
return `command:${command}?${encodeURIComponent(JSON.stringify(args))}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected readonly contextParsingOptions: CommandContextParsingOptions = { editor: false, uri: false };
|
|
||||||
|
|
||||||
private _disposable: Disposable;
|
private _disposable: Disposable;
|
||||||
|
|
||||||
constructor(protected command: Commands) {
|
constructor(protected command: Commands) {
|
||||||
super(() => this.dispose());
|
super(() => this.dispose());
|
||||||
|
|
||||||
this._disposable = commands.registerCommand(command, this._execute, this);
|
this._disposable = commands.registerCommand(command, this._execute, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -186,86 +86,46 @@ export abstract class Command extends Disposable {
|
|||||||
this._disposable && this._disposable.dispose();
|
this._disposable && this._disposable.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async preExecute(context: CommandContext, ...args: any[]): Promise<any> {
|
protected _execute(...args: any[]): any {
|
||||||
|
Telemetry.trackEvent(this.command);
|
||||||
return this.execute(...args);
|
return this.execute(...args);
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract execute(...args: any[]): any;
|
abstract execute(...args: any[]): any;
|
||||||
|
}
|
||||||
|
|
||||||
protected _execute(...args: any[]): any {
|
export abstract class EditorCommand extends Disposable {
|
||||||
|
|
||||||
|
private _disposable: Disposable;
|
||||||
|
|
||||||
|
constructor(public readonly command: Commands) {
|
||||||
|
super(() => this.dispose());
|
||||||
|
this._disposable = commands.registerTextEditorCommand(command, this._execute, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
dispose() {
|
||||||
|
this._disposable && this._disposable.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private _execute(editor: TextEditor, edit: TextEditorEdit, ...args: any[]): any {
|
||||||
Telemetry.trackEvent(this.command);
|
Telemetry.trackEvent(this.command);
|
||||||
|
return this.execute(editor, edit, ...args);
|
||||||
const [context, rest] = Command._parseContext(this.contextParsingOptions, ...args);
|
|
||||||
return this.preExecute(context, ...rest);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static _parseContext(options: CommandContextParsingOptions, ...args: any[]): [CommandContext, any[]] {
|
abstract execute(editor: TextEditor, edit: TextEditorEdit, ...args: any[]): any;
|
||||||
let editor: TextEditor | undefined = undefined;
|
|
||||||
|
|
||||||
let firstArg = args[0];
|
|
||||||
if (options.editor && (firstArg === undefined || isTextEditor(firstArg))) {
|
|
||||||
editor = firstArg;
|
|
||||||
args = args.slice(1);
|
|
||||||
firstArg = args[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options.uri && (firstArg === undefined || firstArg instanceof Uri)) {
|
|
||||||
const [uri, ...rest] = args as [Uri, any];
|
|
||||||
return [{ type: 'uri', editor: editor, uri: uri }, rest];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (firstArg instanceof ExplorerNode) {
|
|
||||||
const [node, ...rest] = args as [ExplorerNode, any];
|
|
||||||
return [{ type: 'view', node: node, uri: node.uri }, rest];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isScmResourceState(firstArg)) {
|
|
||||||
const states = [];
|
|
||||||
let count = 0;
|
|
||||||
for (const arg of args) {
|
|
||||||
if (!isScmResourceState(arg)) break;
|
|
||||||
|
|
||||||
count++;
|
|
||||||
states.push(arg);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [{ type: 'scm-states', scmResourceStates: states, uri: states[0].resourceUri }, args.slice(count)];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isScmResourceGroup(firstArg)) {
|
|
||||||
const groups = [];
|
|
||||||
let count = 0;
|
|
||||||
for (const arg of args) {
|
|
||||||
if (!isScmResourceGroup(arg)) break;
|
|
||||||
|
|
||||||
count++;
|
|
||||||
groups.push(arg);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [{ type: 'scm-groups', scmResourceGroups: groups }, args.slice(count)];
|
|
||||||
}
|
|
||||||
|
|
||||||
return [{ type: 'unknown', editor: editor }, args];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export abstract class ActiveEditorCommand extends Command {
|
export abstract class ActiveEditorCommand extends Command {
|
||||||
|
|
||||||
protected readonly contextParsingOptions: CommandContextParsingOptions = { editor: true, uri: true };
|
|
||||||
|
|
||||||
constructor(public readonly command: Commands) {
|
constructor(public readonly command: Commands) {
|
||||||
super(command);
|
super(command);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async preExecute(context: CommandContext, ...args: any[]): Promise<any> {
|
|
||||||
return this.execute(context.editor, context.uri, ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected _execute(...args: any[]): any {
|
protected _execute(...args: any[]): any {
|
||||||
return super._execute(window.activeTextEditor, ...args);
|
return super._execute(window.activeTextEditor, ...args);
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract execute(editor?: TextEditor, ...args: any[]): any;
|
abstract execute(editor: TextEditor, ...args: any[]): any;
|
||||||
}
|
}
|
||||||
|
|
||||||
let lastCommand: { command: string, args: any[] } | undefined = undefined;
|
let lastCommand: { command: string, args: any[] } | undefined = undefined;
|
||||||
@@ -290,27 +150,6 @@ export abstract class ActiveEditorCachedCommand extends ActiveEditorCommand {
|
|||||||
abstract execute(editor: TextEditor, ...args: any[]): any;
|
abstract execute(editor: TextEditor, ...args: any[]): any;
|
||||||
}
|
}
|
||||||
|
|
||||||
export abstract class EditorCommand extends Disposable {
|
|
||||||
|
|
||||||
private _disposable: Disposable;
|
|
||||||
|
|
||||||
constructor(public readonly command: Commands) {
|
|
||||||
super(() => this.dispose());
|
|
||||||
this._disposable = commands.registerTextEditorCommand(command, this._execute, this);
|
|
||||||
}
|
|
||||||
|
|
||||||
dispose() {
|
|
||||||
this._disposable && this._disposable.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
private _execute(editor: TextEditor, edit: TextEditorEdit, ...args: any[]): any {
|
|
||||||
Telemetry.trackEvent(this.command);
|
|
||||||
return this.execute(editor, edit, ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract execute(editor: TextEditor, edit: TextEditorEdit, ...args: any[]): any;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function openEditor(uri: Uri, options?: TextDocumentShowOptions): Promise<TextEditor | undefined> {
|
export async function openEditor(uri: Uri, options?: TextDocumentShowOptions): Promise<TextEditor | undefined> {
|
||||||
try {
|
try {
|
||||||
const defaults: TextDocumentShowOptions = {
|
const defaults: TextDocumentShowOptions = {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { Iterables } from '../system';
|
import { Iterables } from '../system';
|
||||||
import { TextEditor, Uri, window } from 'vscode';
|
import { TextEditor, Uri, window } from 'vscode';
|
||||||
import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, isCommandViewContextWithCommit } from './common';
|
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
||||||
import { GitService, GitUri } from '../gitService';
|
import { GitService, GitUri } from '../gitService';
|
||||||
import { Logger } from '../logger';
|
import { Logger } from '../logger';
|
||||||
import { copy } from 'copy-paste';
|
import { copy } from 'copy-paste';
|
||||||
@@ -17,22 +17,10 @@ export class CopyMessageToClipboardCommand extends ActiveEditorCommand {
|
|||||||
super(Commands.CopyMessageToClipboard);
|
super(Commands.CopyMessageToClipboard);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async preExecute(context: CommandContext, args: CopyMessageToClipboardCommandArgs = {}): Promise<any> {
|
async execute(editor: TextEditor, uri?: Uri, args: CopyMessageToClipboardCommandArgs = {}): Promise<any> {
|
||||||
if (isCommandViewContextWithCommit(context)) {
|
|
||||||
args = { ...args };
|
|
||||||
args.sha = context.node.commit.sha;
|
|
||||||
return this.execute(context.editor, context.node.commit.uri, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.execute(context.editor, context.uri, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
async execute(editor?: TextEditor, uri?: Uri, args: CopyMessageToClipboardCommandArgs = {}): Promise<any> {
|
|
||||||
uri = getCommandUri(uri, editor);
|
uri = getCommandUri(uri, editor);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
args = { ...args };
|
|
||||||
|
|
||||||
// If we don't have an editor then get the message of the last commit to the branch
|
// If we don't have an editor then get the message of the last commit to the branch
|
||||||
if (uri === undefined) {
|
if (uri === undefined) {
|
||||||
if (!this.git.repoPath) return undefined;
|
if (!this.git.repoPath) return undefined;
|
||||||
@@ -74,7 +62,7 @@ export class CopyMessageToClipboardCommand extends ActiveEditorCommand {
|
|||||||
|
|
||||||
// Get the full commit message -- since blame only returns the summary
|
// Get the full commit message -- since blame only returns the summary
|
||||||
const commit = await this.git.getLogCommit(gitUri.repoPath, gitUri.fsPath, args.sha);
|
const commit = await this.git.getLogCommit(gitUri.repoPath, gitUri.fsPath, args.sha);
|
||||||
if (commit === undefined) return undefined;
|
if (!commit) return undefined;
|
||||||
|
|
||||||
args.message = commit.message;
|
args.message = commit.message;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { Iterables } from '../system';
|
import { Iterables } from '../system';
|
||||||
import { TextEditor, Uri, window } from 'vscode';
|
import { TextEditor, Uri, window } from 'vscode';
|
||||||
import { ActiveEditorCommand, CommandContext, Commands, getCommandUri, isCommandViewContextWithCommit } from './common';
|
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
||||||
import { GitService, GitUri } from '../gitService';
|
import { GitService, GitUri } from '../gitService';
|
||||||
import { Logger } from '../logger';
|
import { Logger } from '../logger';
|
||||||
import { copy } from 'copy-paste';
|
import { copy } from 'copy-paste';
|
||||||
@@ -16,22 +16,10 @@ export class CopyShaToClipboardCommand extends ActiveEditorCommand {
|
|||||||
super(Commands.CopyShaToClipboard);
|
super(Commands.CopyShaToClipboard);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async preExecute(context: CommandContext, args: CopyShaToClipboardCommandArgs = {}): Promise<any> {
|
async execute(editor: TextEditor, uri?: Uri, args: CopyShaToClipboardCommandArgs = {}): Promise<any> {
|
||||||
if (isCommandViewContextWithCommit(context)) {
|
|
||||||
args = { ...args };
|
|
||||||
args.sha = context.node.commit.sha;
|
|
||||||
return this.execute(context.editor, context.node.commit.uri, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.execute(context.editor, context.uri, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
async execute(editor?: TextEditor, uri?: Uri, args: CopyShaToClipboardCommandArgs = {}): Promise<any> {
|
|
||||||
uri = getCommandUri(uri, editor);
|
uri = getCommandUri(uri, editor);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
args = { ...args };
|
|
||||||
|
|
||||||
// If we don't have an editor then get the sha of the last commit to the branch
|
// If we don't have an editor then get the sha of the last commit to the branch
|
||||||
if (uri === undefined) {
|
if (uri === undefined) {
|
||||||
if (!this.git.repoPath) return undefined;
|
if (!this.git.repoPath) return undefined;
|
||||||
@@ -55,7 +43,7 @@ export class CopyShaToClipboardCommand extends ActiveEditorCommand {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const blame = await this.git.getBlameForLine(gitUri, blameline);
|
const blame = await this.git.getBlameForLine(gitUri, blameline);
|
||||||
if (blame === undefined) return undefined;
|
if (!blame) return undefined;
|
||||||
|
|
||||||
args.sha = blame.commit.sha;
|
args.sha = blame.commit.sha;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,9 @@
|
|||||||
import { Iterables } from '../system';
|
import { Iterables } from '../system';
|
||||||
import { commands, TextEditor, Uri, window } from 'vscode';
|
import { commands, TextEditor, Uri, window } from 'vscode';
|
||||||
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
||||||
import { BuiltInCommands, GlyphChars } from '../constants';
|
import { BuiltInCommands } from '../constants';
|
||||||
import { GitService } from '../gitService';
|
import { GitService } from '../gitService';
|
||||||
import { Logger } from '../logger';
|
import { Logger } from '../logger';
|
||||||
import { Messages } from '../messages';
|
|
||||||
import { BranchesQuickPick, CommandQuickPickItem } from '../quickPicks';
|
import { BranchesQuickPick, CommandQuickPickItem } from '../quickPicks';
|
||||||
|
|
||||||
export interface DiffDirectoryCommandCommandArgs {
|
export interface DiffDirectoryCommandCommandArgs {
|
||||||
@@ -19,7 +18,7 @@ export class DiffDirectoryCommand extends ActiveEditorCommand {
|
|||||||
super(Commands.DiffDirectory);
|
super(Commands.DiffDirectory);
|
||||||
}
|
}
|
||||||
|
|
||||||
async execute(editor?: TextEditor, uri?: Uri, args: DiffDirectoryCommandCommandArgs = {}): Promise<any> {
|
async execute(editor: TextEditor, uri?: Uri, args: DiffDirectoryCommandCommandArgs = {}): Promise<any> {
|
||||||
const diffTool = await this.git.getConfig('diff.tool');
|
const diffTool = await this.git.getConfig('diff.tool');
|
||||||
if (!diffTool) {
|
if (!diffTool) {
|
||||||
const result = await window.showWarningMessage(`Unable to open directory compare because there is no Git diff tool configured`, 'View Git Docs');
|
const result = await window.showWarningMessage(`Unable to open directory compare because there is no Git diff tool configured`, 'View Git Docs');
|
||||||
@@ -32,16 +31,14 @@ export class DiffDirectoryCommand extends ActiveEditorCommand {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const repoPath = await this.git.getRepoPathFromUri(uri);
|
const repoPath = await this.git.getRepoPathFromUri(uri);
|
||||||
if (!repoPath) return Messages.showNoRepositoryWarningMessage(`Unable to open directory compare`);
|
if (!repoPath) return window.showWarningMessage(`Unable to open directory compare`);
|
||||||
|
|
||||||
if (!args.shaOrBranch1) {
|
if (!args.shaOrBranch1) {
|
||||||
args = { ...args };
|
|
||||||
|
|
||||||
const branches = await this.git.getBranches(repoPath);
|
const branches = await this.git.getBranches(repoPath);
|
||||||
const current = Iterables.find(branches, _ => _.current);
|
const current = Iterables.find(branches, _ => _.current);
|
||||||
if (current == null) return window.showWarningMessage(`Unable to open directory compare`);
|
if (current == null) return window.showWarningMessage(`Unable to open directory compare`);
|
||||||
|
|
||||||
const pick = await BranchesQuickPick.show(branches, `Compare ${current.name} to ${GlyphChars.Ellipsis}`);
|
const pick = await BranchesQuickPick.show(branches, `Compare ${current.name} to \u2026`);
|
||||||
if (pick === undefined) return undefined;
|
if (pick === undefined) return undefined;
|
||||||
|
|
||||||
if (pick instanceof CommandQuickPickItem) return pick.execute();
|
if (pick instanceof CommandQuickPickItem) return pick.execute();
|
||||||
|
|||||||
@@ -1,14 +1,15 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
|
import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
|
||||||
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
||||||
import { DiffWithCommandArgs } from './diffWith';
|
import { BuiltInCommands } from '../constants';
|
||||||
|
import { DiffWithPreviousCommandArgs } from './diffWithPrevious';
|
||||||
|
import { DiffWithWorkingCommandArgs } from './diffWithWorking';
|
||||||
import { GitCommit, GitService, GitUri } from '../gitService';
|
import { GitCommit, GitService, GitUri } from '../gitService';
|
||||||
import { Logger } from '../logger';
|
import { Logger } from '../logger';
|
||||||
import { Messages } from '../messages';
|
import * as path from 'path';
|
||||||
|
|
||||||
export interface DiffLineWithPreviousCommandArgs {
|
export interface DiffLineWithPreviousCommandArgs {
|
||||||
commit?: GitCommit;
|
commit?: GitCommit;
|
||||||
|
|
||||||
line?: number;
|
line?: number;
|
||||||
showOptions?: TextDocumentShowOptions;
|
showOptions?: TextDocumentShowOptions;
|
||||||
}
|
}
|
||||||
@@ -19,16 +20,12 @@ export class DiffLineWithPreviousCommand extends ActiveEditorCommand {
|
|||||||
super(Commands.DiffLineWithPrevious);
|
super(Commands.DiffLineWithPrevious);
|
||||||
}
|
}
|
||||||
|
|
||||||
async execute(editor?: TextEditor, uri?: Uri, args: DiffLineWithPreviousCommandArgs = {}): Promise<any> {
|
async execute(editor: TextEditor, uri?: Uri, args: DiffLineWithPreviousCommandArgs = {}): Promise<any> {
|
||||||
uri = getCommandUri(uri, editor);
|
uri = getCommandUri(uri, editor);
|
||||||
if (uri === undefined) return undefined;
|
if (uri === undefined) return undefined;
|
||||||
|
|
||||||
const gitUri = await GitUri.fromUri(uri, this.git);
|
const gitUri = await GitUri.fromUri(uri, this.git);
|
||||||
|
args.line = args.line || (editor === undefined ? gitUri.offset : editor.selection.active.line);
|
||||||
args = { ...args };
|
|
||||||
if (args.line === undefined) {
|
|
||||||
args.line = editor === undefined ? gitUri.offset : editor.selection.active.line;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args.commit === undefined || GitService.isUncommitted(args.commit.sha)) {
|
if (args.commit === undefined || GitService.isUncommitted(args.commit.sha)) {
|
||||||
if (editor !== undefined && editor.document !== undefined && editor.document.isDirty) return undefined;
|
if (editor !== undefined && editor.document !== undefined && editor.document.isDirty) return undefined;
|
||||||
@@ -38,29 +35,55 @@ export class DiffLineWithPreviousCommand extends ActiveEditorCommand {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const blame = await this.git.getBlameForLine(gitUri, blameline);
|
const blame = await this.git.getBlameForLine(gitUri, blameline);
|
||||||
if (blame === undefined) return Messages.showFileNotUnderSourceControlWarningMessage('Unable to open compare');
|
if (blame === undefined) return window.showWarningMessage(`Unable to open compare. File is probably not under source control`);
|
||||||
|
|
||||||
args.commit = blame.commit;
|
args.commit = blame.commit;
|
||||||
|
|
||||||
|
// If we don't have a sha or the current commit matches the blame, show the previous
|
||||||
|
if (gitUri.sha === undefined || gitUri.sha === args.commit.sha) {
|
||||||
|
return commands.executeCommand(Commands.DiffWithPrevious, new GitUri(uri, args.commit), {
|
||||||
|
line: args.line,
|
||||||
|
showOptions: args.showOptions
|
||||||
|
} as DiffWithPreviousCommandArgs);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the line is uncommitted, find the previous commit and treat it as a DiffWithWorking
|
||||||
|
if (args.commit.isUncommitted) {
|
||||||
|
uri = args.commit.uri;
|
||||||
|
args.commit = new GitCommit(args.commit.type, args.commit.repoPath, args.commit.previousSha!, args.commit.previousFileName!, args.commit.author, args.commit.date, args.commit.message);
|
||||||
|
args.line = (blame.line.line + 1) + gitUri.offset;
|
||||||
|
|
||||||
|
return commands.executeCommand(Commands.DiffWithWorking, uri, {
|
||||||
|
commit: args.commit,
|
||||||
|
line: args.line,
|
||||||
|
showOptions: args.showOptions
|
||||||
|
} as DiffWithWorkingCommandArgs);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (ex) {
|
catch (ex) {
|
||||||
Logger.error(ex, 'DiffLineWithPreviousCommand', `getBlameForLine(${blameline})`);
|
Logger.error(ex, 'DiffWithPreviousLineCommand', `getBlameForLine(${blameline})`);
|
||||||
return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
|
return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const diffArgs: DiffWithCommandArgs = {
|
try {
|
||||||
repoPath: args.commit.repoPath,
|
const [rhs, lhs] = await Promise.all([
|
||||||
lhs: {
|
this.git.getVersionedFile(gitUri.repoPath, gitUri.fsPath, gitUri.sha!),
|
||||||
sha: args.commit.previousSha !== undefined ? args.commit.previousSha : GitService.fakeSha,
|
this.git.getVersionedFile(args.commit.repoPath, args.commit.uri.fsPath, args.commit.sha)
|
||||||
uri: args.commit.previousUri
|
]);
|
||||||
},
|
|
||||||
rhs: {
|
await commands.executeCommand(BuiltInCommands.Diff,
|
||||||
sha: args.commit.sha,
|
Uri.file(lhs),
|
||||||
uri: args.commit.uri
|
Uri.file(rhs),
|
||||||
},
|
`${path.basename(args.commit.uri.fsPath)} (${args.commit.shortSha}) \u2194 ${path.basename(gitUri.fsPath)} (${gitUri.shortSha})`,
|
||||||
line: args.line,
|
args.showOptions);
|
||||||
showOptions: args.showOptions
|
|
||||||
};
|
// TODO: Figure out how to focus the left pane
|
||||||
return commands.executeCommand(Commands.DiffWith, diffArgs);
|
return await commands.executeCommand(BuiltInCommands.RevealLine, { lineNumber: args.line, at: 'center' });
|
||||||
|
}
|
||||||
|
catch (ex) {
|
||||||
|
Logger.error(ex, 'DiffWithPreviousLineCommand', 'getVersionedFile');
|
||||||
|
return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,14 +1,12 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
|
import { commands, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
|
||||||
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
import { ActiveEditorCommand, Commands, getCommandUri } from './common';
|
||||||
import { DiffWithCommandArgs } from './diffWith';
|
import { DiffWithWorkingCommandArgs } from './diffWithWorking';
|
||||||
import { GitCommit, GitService, GitUri } from '../gitService';
|
import { GitCommit, GitService, GitUri } from '../gitService';
|
||||||
import { Messages } from '../messages';
|
|
||||||
import { Logger } from '../logger';
|
import { Logger } from '../logger';
|
||||||
|
|
||||||
export interface DiffLineWithWorkingCommandArgs {
|
export interface DiffLineWithWorkingCommandArgs {
|
||||||
commit?: GitCommit;
|
commit?: GitCommit;
|
||||||
|
|
||||||
line?: number;
|
line?: number;
|
||||||
showOptions?: TextDocumentShowOptions;
|
showOptions?: TextDocumentShowOptions;
|
||||||
}
|
}
|
||||||
@@ -19,16 +17,12 @@ export class DiffLineWithWorkingCommand extends ActiveEditorCommand {
|
|||||||
super(Commands.DiffLineWithWorking);
|
super(Commands.DiffLineWithWorking);
|
||||||
}
|
}
|
||||||
|
|
||||||
async execute(editor?: TextEditor, uri?: Uri, args: DiffLineWithWorkingCommandArgs = {}): Promise<any> {
|
async execute(editor: TextEditor, uri?: Uri, args: DiffLineWithWorkingCommandArgs = {}): Promise<any> {
|
||||||
uri = getCommandUri(uri, editor);
|
uri = getCommandUri(uri, editor);
|
||||||
if (uri === undefined) return undefined;
|
if (uri === undefined) return undefined;
|
||||||
|
|
||||||
const gitUri = await GitUri.fromUri(uri, this.git);
|
const gitUri = await GitUri.fromUri(uri, this.git);
|
||||||
|
args.line = args.line || (editor === undefined ? gitUri.offset : editor.selection.active.line);
|
||||||
args = { ...args };
|
|
||||||
if (args.line === undefined) {
|
|
||||||
args.line = editor === undefined ? gitUri.offset : editor.selection.active.line;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args.commit === undefined || GitService.isUncommitted(args.commit.sha)) {
|
if (args.commit === undefined || GitService.isUncommitted(args.commit.sha)) {
|
||||||
if (editor !== undefined && editor.document !== undefined && editor.document.isDirty) return undefined;
|
if (editor !== undefined && editor.document !== undefined && editor.document.isDirty) return undefined;
|
||||||
@@ -38,7 +32,7 @@ export class DiffLineWithWorkingCommand extends ActiveEditorCommand {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const blame = await this.git.getBlameForLine(gitUri, blameline);
|
const blame = await this.git.getBlameForLine(gitUri, blameline);
|
||||||
if (blame === undefined) return Messages.showFileNotUnderSourceControlWarningMessage('Unable to open compare');
|
if (blame === undefined) return window.showWarningMessage(`Unable to open compare. File is probably not under source control`);
|
||||||
|
|
||||||
args.commit = blame.commit;
|
args.commit = blame.commit;
|
||||||
// If the line is uncommitted, find the previous commit
|
// If the line is uncommitted, find the previous commit
|
||||||
@@ -53,19 +47,6 @@ export class DiffLineWithWorkingCommand extends ActiveEditorCommand {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const diffArgs: DiffWithCommandArgs = {
|
return commands.executeCommand(Commands.DiffWithWorking, uri, args as DiffWithWorkingCommandArgs);
|
||||||
repoPath: args.commit.repoPath,
|
|
||||||
lhs: {
|
|
||||||
sha: args.commit.sha,
|
|
||||||
uri: args.commit.uri
|
|
||||||
},
|
|
||||||
rhs: {
|
|
||||||
sha: '',
|
|
||||||
uri: args.commit.uri
|
|
||||||
},
|
|
||||||
line: args.line,
|
|
||||||
showOptions: args.showOptions
|
|
||||||
};
|
|
||||||
return commands.executeCommand(Commands.DiffWith, diffArgs);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,142 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
import { commands, Range, TextDocumentShowOptions, TextEditor, Uri, window } from 'vscode';
|
|
||||||
import { ActiveEditorCommand, Commands } from './common';
|
|
||||||
import { BuiltInCommands, GlyphChars } from '../constants';
|
|
||||||
import { GitCommit, GitService } from '../gitService';
|
|
||||||
import { Logger } from '../logger';
|
|
||||||
import * as path from 'path';
|
|
||||||
|
|
||||||
export interface DiffWithCommandArgsRevision {
|
|
||||||
sha: string;
|
|
||||||
uri: Uri;
|
|
||||||
title?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface DiffWithCommandArgs {
|
|
||||||
lhs?: DiffWithCommandArgsRevision;
|
|
||||||
rhs?: DiffWithCommandArgsRevision;
|
|
||||||
repoPath?: string;
|
|
||||||
|
|
||||||
line?: number;
|
|
||||||
showOptions?: TextDocumentShowOptions;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class DiffWithCommand extends ActiveEditorCommand {
|
|
||||||
|
|
||||||
static getMarkdownCommandArgs(args: DiffWithCommandArgs): string;
|
|
||||||
static getMarkdownCommandArgs(commit1: GitCommit, commit2: GitCommit): string;
|
|
||||||
static getMarkdownCommandArgs(argsOrCommit1: DiffWithCommandArgs | GitCommit, commit2?: GitCommit): string {
|
|
||||||
let args = argsOrCommit1;
|
|
||||||
if (argsOrCommit1 instanceof GitCommit) {
|
|
||||||
const commit1 = argsOrCommit1;
|
|
||||||
|
|
||||||
if (commit2 === undefined) {
|
|
||||||
if (commit1.isUncommitted) {
|
|
||||||
args = {
|
|
||||||
repoPath: commit1.repoPath,
|
|
||||||
lhs: {
|
|
||||||
sha: 'HEAD',
|
|
||||||
uri: commit1.uri
|
|
||||||
},
|
|
||||||
rhs: {
|
|
||||||
sha: '',
|
|
||||||
uri: commit1.uri
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
args = {
|
|
||||||
repoPath: commit1.repoPath,
|
|
||||||
lhs: {
|
|
||||||
sha: commit1.previousSha!,
|
|
||||||
uri: commit1.previousUri!
|
|
||||||
},
|
|
||||||
rhs: {
|
|
||||||
sha: commit1.sha,
|
|
||||||
uri: commit1.uri
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
args = {
|
|
||||||
repoPath: commit1.repoPath,
|
|
||||||
lhs: {
|
|
||||||
sha: commit1.sha,
|
|
||||||
uri: commit1.uri
|
|
||||||
},
|
|
||||||
rhs: {
|
|
||||||
sha: commit2.sha,
|
|
||||||
uri: commit2.uri
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return super.getMarkdownCommandArgsCore<DiffWithCommandArgs>(Commands.DiffWith, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(private git: GitService) {
|
|
||||||
super(Commands.DiffWith);
|
|
||||||
}
|
|
||||||
|
|
||||||
async execute(editor?: TextEditor, uri?: Uri, args: DiffWithCommandArgs = {}): Promise<any> {
|
|
||||||
args = { ...args };
|
|
||||||
if (args.repoPath === undefined || args.lhs === undefined || args.rhs === undefined) return undefined;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const [lhs, rhs] = await Promise.all([
|
|
||||||
args.lhs.sha !== '' && !GitService.isUncommitted(args.lhs.sha)
|
|
||||||
? this.git.getVersionedFile(args.repoPath, args.lhs.uri.fsPath, args.lhs.sha)
|
|
||||||
: args.lhs.uri.fsPath,
|
|
||||||
args.rhs.sha !== '' && !GitService.isUncommitted(args.rhs.sha)
|
|
||||||
? this.git.getVersionedFile(args.repoPath, args.rhs.uri.fsPath, args.rhs.sha)
|
|
||||||
: args.rhs.uri.fsPath
|
|
||||||
]);
|
|
||||||
|
|
||||||
if (args.line !== undefined && args.line !== 0) {
|
|
||||||
if (args.showOptions === undefined) {
|
|
||||||
args.showOptions = {};
|
|
||||||
}
|
|
||||||
args.showOptions.selection = new Range(args.line, 0, args.line, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
let rhsPrefix = '';
|
|
||||||
if (rhs === undefined) {
|
|
||||||
rhsPrefix = 'deleted in ';
|
|
||||||
}
|
|
||||||
else if (lhs === undefined || args.lhs.sha === GitService.fakeSha) {
|
|
||||||
rhsPrefix = 'added in ';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args.lhs.title === undefined && lhs !== undefined && args.lhs.sha !== GitService.fakeSha) {
|
|
||||||
args.lhs.title = (args.lhs.sha === '' || GitService.isUncommitted(args.lhs.sha))
|
|
||||||
? `${path.basename(args.lhs.uri.fsPath)}`
|
|
||||||
: `${path.basename(args.lhs.uri.fsPath)} (${GitService.shortenSha(args.lhs.sha)})`;
|
|
||||||
}
|
|
||||||
if (args.rhs.title === undefined && args.rhs.sha !== GitService.fakeSha) {
|
|
||||||
args.rhs.title = (args.rhs.sha === '' || GitService.isUncommitted(args.rhs.sha))
|
|
||||||
? `${path.basename(args.rhs.uri.fsPath)}`
|
|
||||||
: `${path.basename(args.rhs.uri.fsPath)} (${rhsPrefix}${GitService.shortenSha(args.rhs.sha)})`;
|
|
||||||
}
|
|
||||||
|
|
||||||
const title = (args.lhs.title !== undefined && args.rhs.title !== undefined)
|
|
||||||
? `${args.lhs.title} ${GlyphChars.ArrowLeftRight} ${args.rhs.title}`
|
|
||||||
: args.lhs.title || args.rhs.title;
|
|
||||||
|
|
||||||
return await commands.executeCommand(BuiltInCommands.Diff,
|
|
||||||
lhs === undefined
|
|
||||||
? GitService.toGitContentUri(GitService.fakeSha, args.lhs.uri.fsPath, args.repoPath)
|
|
||||||
: Uri.file(lhs),
|
|
||||||
rhs === undefined
|
|
||||||
? GitService.toGitContentUri(GitService.fakeSha, args.rhs.uri.fsPath, args.repoPath)
|
|
||||||
: Uri.file(rhs),
|
|
||||||
title,
|
|
||||||
args.showOptions);
|
|
||||||
}
|
|
||||||
catch (ex) {
|
|
||||||
Logger.error(ex, 'DiffWithCommand', 'getVersionedFile');
|
|
||||||
return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user