ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-06 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.26.1 (#2394)

Browse Source 
* Squash merge commits for 1.26 (#1) (#2323)

* Polish tag search as per feedback (#55269)

* Polish tag search as per feedback

* Updated regex

* Allow users to opt-out of features that send online requests in the background (#55097)

* settings sweep #54690

* Minor css tweaks to enable eoverflow elipsis in more places (#55277)

* fix an issue with titlebarheight when not scaling with zoom

* Settings descriptions update #54690

* fixes #55209

* Settings editor - many padding fixes

* More space above level 2 label

* Fixing Cannot debug npm script using Yarn #55103

* Settings editor - show ellipsis when description overflows

* Settings editor - ... fix measuring around links, relayout

* Setting descriptions

* Settings editor - fix ... for some short lines, fix select container width

* Settings editor - overlay trees so scrollable shadow is full width

* Fix #54133 - missing extension settings after reload

* Settings color token description tweak

* Settings editor - disable overflow indicator temporarily, needs to be faster

* Added command to Run the selected npm script

* fixes #54452

* fixes #54929

* fixes #55248

* prefix command with extension name

* Contribute run selected to the context menu

* node-debug@1.26.6

* Allow terminal rendererType to be swapped out at runtime

Part of #53274
Fixes #55344

* Settings editor - fix not focusing search when restoring editor
setInput must be actually async. Will be fixed naturally when we aren't using winJS promises...

* Settings editor - TOC should only expand the section with a selected item

* Bump node-debug2

* Settings editor - Tree focus outlines

* Settings editor - don't blink the scrollbar when toc selection changes
And hide TOC correctly when the editor is narrow

* Settings editor - header rows should not be selectable

* fixes #54877

* change debug assignee to isi

* Settings sweep (#54690)

* workaround for #55051

* Settings sweep (#54690)

* settings sweep

#54690

* Don't try closing tags when you type > after another >

* Describe what implementation code lens does

Fixes #55370

* fix javadoc formatter setting description

* fixes #55325

* update to officical TS version

* Settings editor - Even more padding, use semibold instead of bold

* Fix #55357 - fix TOC twistie

* fixes #55288

* explorer: refresh on di change file system provider registration

fixes #53256

* Disable push to Linux repo to test standalone publisher

* New env var to notify log level to extensions #54001

* Disable snippets in extension search (when not in suggest dropdown) (#55281)

* Disable snippits in extension search (when not in suggest dropdown)

* Add monaco input contributions

* Fix bug preventing snippetSuggestions from taking effect in sub-editors

* Latest emmet helper to fix #52366

* Fix comment updates for threads within same file

* Allow extensions to log telemetry to log files #54001

* Pull latest css grammar

* files.exclude control - use same style for "add" vs "edit"

* files.exclude control - focus/keyboard behavior

* don't show menubar too early

* files.exclude - better styling

* Place cursor at end of extensions search box on autofill (#55254)

* Place cursor at end of extensions search box on autofill

* Use position instead of selection

* fix linux build issue (empty if block)

* Settings editor - fix extension category prefixes

* Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO

* File/Text search provider docs

* Fixes #52655

* Include epoch (#55008)

* Fixes #53385

* Fixes #49480

*  VS Code Insiders (Users) not opening Fixes #55353

* Better handling of the case when the extension host fails to start

* Fixes #53966

*  Remove confusing Start from wordPartLeft commands ID

* vscode-xterm@3.6.0-beta12

Fixes #55488

* Initial size is set to infinity!! Fixes #55461

* Polish embeddedEditorBackground

* configuration service misses event

* Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query

* Select all not working in issue reporter on mac, fixes #55424

* Disable fuzzy matching for extensions autosuggest (#55498)

* Fix clipping of extensions search border in some third party themes (#55504)

* fixes #55538

* Fix bug causing an aria alert to not be shown the third time
 (and odd numbers thereafter)

* Settings editor - work around rendering glitch with webkit-line-clamp

* Settings editor - revert earlier '...' changes

* Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason

* Settings editor - better overflow indicator

* Don't show existing filters in autocomplete (#55495)

* Dont show existing filters in autocomplete

* Simplify

* Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543)

* fixes #55223

* Update vscode-css-languageservice to 3.0.10-next.1

* Fix #55509 - settings navigation

* Fix #55519

* Fix #55520

* FIx #55524

* Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly

* oss updates for endgame

* Fix unit tests

* fixes #55522

* Avoid missing manifest error from bubbling up #54757

* Settings format crawl

* Search provider - Fix FileSearchProvider to return array, not progress

* Fix #55598

* Settings editor - fix NPE rendering settings with no description

* dont render inden guides in search box (#55600)

* fixes #55454

* More settings crawl

* Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex

* Fix FileSearchProvider unit tests for progress change

* fixes #55561

* Settings description update for #54690

* Update setting descriptions for online services

* Minor edits

* fixes #55513

* fixes #55451

* Fix #55612 - fix findTextInFiles cancellation

* fixes #55539

* More setting description tweaks

* Setting to disable online experiments #54354

* fixes #55507

* fixes #55515

* Show online services action only in Insiders for now

* Settings editor - change toc behavior default to 'filter'

* Settings editor - nicer filter count style during search

* Fix #55617 - search viewlet icons

* Settings editor - better styling for element count indicator

* SearchProvider - fix NPE when searching extraFileResources

* Allow extends to work without json suffix

Fixes #16905

* Remove accessability options logic entirely

Follow up on #55451

* use latest version of DAP

* fixes #55490

* fixes #55122

* fixes #52332

* Avoid assumptions about git: URIs (fixes #36236)

* relative path for descriptions

* resourece: get rid of isFile context key

fixes #48275

* Register previous ids for compatibility (#53497)

* more tuning for #48275

* no need to always re-read "files explorer"

fixes #52003

* read out active composites properly

fixes #51967

* Update link colors for hc theme to meet color contrast ratio, fixes #55651

Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated

* detect 'winpty-agent.exe'; fixes #55672

* node-debug@1.26.7

* reset counter on new label

* Settings editor - fix multiple setting links in one description

* Settings editor - color code blocks in setting descriptions, fix #55532

* Settings editor - hover color in TOC

* Settings editor - fix navigation NPE

* Settings editor - fix text control width

* Settings editor - maybe fix #55684

* Fix bug causing cursor to not move on paste

* fixes #53582

* Use ctrlCmd instead of ctrl for go down from search box

* fixes #55264

* fixes #55456

* filter for spcaes before triggering search (#55611)

* Fix #55698 - don't lose filtered TOC counts when refreshing TOC

* fixes #55421

* fixes #28979

* fixes #55576

* only add check for updates to windows/linux help

* readonly files: append decoration to label

fixes #53022

* debug: do not show toolbar while initialising

fixes #55026

* Opening launch.json should not activate debug extensions

fixes #55029

* fixes #55435

* fixes #55434

* fixes #55439

* trigger menu only on altkey up

* Fix #50555 - fix settings editor memory leak

* Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render

* fixes #55335

* proper fix for readonly model

fixes #53022

* improve FoldingRangeKind spec (for #55686)

* Use class with static fields (fixes #55494)

* Fixes #53671

* fixes #54630

* [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324

* cleanup deps

* debug issues back to andre

* update electron for smoketest

* Fix #55757 - prevent settings tabs from overflowing

* Fix #53897 - revert setting menu defaults to old editor

* Add enum descriptions to `typescript.preferences.importModuleSpecifier`

* Fix #55767 - leaking style elements from settings editor

* Fix #55521 - prevent flashing when clicking in exclude control

* Update Git modified color for contrast ratio, fixes #53140

* Revert "Merge branch 'master' of github.com:Microsoft/vscode"

This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing
changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917.

* Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode""

This reverts commit 53949d963f39e40757557c6526332354a31d9154.

* don't ask to install an incomplete menu

* Fix NPE in terminal AccessibilityManager

Fixes #55744

* don't display fallback menu unless we've closed the last window

* fixes #55547

* Fix smoke tests for extension search box

* Update OSSREADME.json for Electron 2.0.5

* Update distro

Includes Chromium license changes

* fix #55455

* fix #55865

* fixes #55893

* Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805)

* Fix bug causing workspace recommendations to go away upon ignoring a recommendation

* ONly show on @recommended or @recommended:workspace

* Make more consistant

* Fix #55911

* Understand json activity (#55926)

* Understand json file activity

* Refactoring

* adding composer.json

* Distro update for experiments

* use terminal.processId for auto-attach; fixes #55918

* Reject invalid URI with vscode.openFolder (for #55891)

* improve win32 setup system vs user detection

fixes #55840

fixes #55840

delay winreg import

related to #55840

show notification earlier

related to #55840

fix #55840

update inno setup message

related to #55840

* Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead

* Bring back the old menu due to electron 2.0 issues (#55913)

* add the old menu back for native menus

* make menu labels match

* `vscode.openFolder`: treat missing URI schema gracefully (for #55891)

* delay EH reattach; fixes #55955

* Mark all json files under appSettingsHome as settings

* Use localized strings for telemetry opt-out

* Exception when saving file editor opened from remote file provider (fixes #55051)

* Remove terminal menu from stable

Fixes 56003

* VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933

* improve fix for #55891

* fix #55916

* Improve #55891

* increase EH debugging restart delay; fixes #55955

* Revert "Don't include non-resource entries in history quick pick"

This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060.

* Diff editor: horizontal scrollbar height is smaller (fixes #56062)

* improve openFolder uri fix (correctly treat backslashes)

* fixes #56116
repair ipc for native menubar keybindings

* Fix #56240 - Open the JSON settings editor instead of the UI editor

* Fix #55536

* uriDisplay: if no formatter is registered fall back to getPathlabel

fixes #56104

* VSCode hangs when opening python file. Fixes #56377

* VS Code Hangs When Opening Specific PowerShell File. Fixes #56430

* Fix #56433 - search extraFileResources even when no folders open

* Workaround #55649

* Fix in master #56371

* Fix tests #56371

* Fix in master #56317

* increase version to 1.26.1

* Fixes #56387: Handle SIGPIPE in extension host

* fixes #56185

* Fix merge issues (part 1)

* Fix build breaks (part 1)

* Build breaks (part 2)

* Build breaks (part 3)

* More build breaks (part 4)

* Fix build breaks (part 5)

* WIP

* Fix menus

* Render query result and message panels (#2363)

* Put back query editor hot exit changes

* Fix grid changes that broke profiler (#2365)

* Update APIs for saving query editor state

* Fix restore view state for profiler and edit data

* Updating custom default themes to support 4.5:1 contrast ratio

* Test updates

* Fix Extension Manager and Windows Setup

* Update license headers

* Add appveyor and travis files back

* Fix hidden modal dropdown issue
This commit is contained in:
Karl Burtram
2018-09-04 14:55:00 -07:00
committed by GitHub
parent 3763278366
commit 81329fa7fa
2638 changed files with 118456 additions and 64012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
extensions/git/test/colorize-results/COMMIT_EDITMSG.json
View File

@@ -3,10 +3,10 @@
"c": "This is the summary line. It can't be too long.",
"t": "text.git-commit meta.scope.message.git-commit meta.scope.subject.git-commit",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -14,10 +14,10 @@
"c": "After I can write a much more detailed description without quite the same restrictions on length.",
"t": "text.git-commit meta.scope.message.git-commit",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -25,10 +25,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -36,10 +36,10 @@
"c": " Please enter the commit message for your changes. Lines starting",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -47,10 +47,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -58,10 +58,10 @@
"c": " with '#' will be ignored, and an empty message aborts the commit.",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -69,10 +69,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -80,10 +80,10 @@
"c": " On branch master",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -91,10 +91,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -102,10 +102,10 @@
"c": " Your branch is up-to-date with 'origin/master'.",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -113,10 +113,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -124,10 +124,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -135,10 +135,10 @@
"c": " Changes to be committed:",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -146,10 +146,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -157,10 +157,10 @@
"c": "\t",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -168,10 +168,10 @@
"c": "deleted: README.md",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit markup.deleted.git-commit",
"r": {
"dark_plus": "markup.deleted: #CE9178",
"light_plus": "markup.deleted: #A31515",
"dark_vs": "markup.deleted: #CE9178",
"light_vs": "markup.deleted: #A31515",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "markup.deleted: #CE9178"
}
},
@@ -179,10 +179,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -190,10 +190,10 @@
"c": "\t",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -201,10 +201,10 @@
"c": "modified: index.less",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit markup.changed.git-commit",
"r": {
"dark_plus": "markup.changed: #569CD6",
"light_plus": "markup.changed: #0451A5",
"dark_vs": "markup.changed: #569CD6",
"light_vs": "markup.changed: #0451A5",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "markup.changed: #569CD6"
}
},
@@ -212,10 +212,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -223,10 +223,10 @@
"c": "\t",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -234,10 +234,10 @@
"c": "new file: spec/COMMIT_EDITMSG",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit markup.inserted.git-commit",
"r": {
"dark_plus": "markup.inserted: #B5CEA8",
"light_plus": "markup.inserted: #09885A",
"dark_vs": "markup.inserted: #B5CEA8",
"light_vs": "markup.inserted: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "markup.inserted: #B5CEA8"
}
},
@@ -245,10 +245,10 @@
"c": "#",
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit punctuation.definition.comment.git-commit",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
}

120
extensions/git/test/colorize-results/example_diff.json
View File

@@ -3,10 +3,10 @@
"c": "diff --git a/helloworld.txt b/helloworld.txt",
"t": "source.diff meta.diff.header.git",
"r": {
"dark_plus": "meta.diff.header: #569CD6",
"light_plus": "meta.diff.header: #000080",
"dark_vs": "meta.diff.header: #569CD6",
"light_vs": "meta.diff.header: #000080",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "meta.diff.header: #000080"
}
},
@@ -14,10 +14,10 @@
"c": "index e4f37c4..557db03 100644",
"t": "source.diff meta.diff.index.git",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -25,10 +25,10 @@
"c": "---",
"t": "source.diff meta.diff.header.from-file punctuation.definition.from-file.diff",
"r": {
"dark_plus": "meta.diff.header: #569CD6",
"light_plus": "meta.diff.header: #000080",
"dark_vs": "meta.diff.header: #569CD6",
"light_vs": "meta.diff.header: #000080",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "meta.diff.header: #000080"
}
},
@@ -36,10 +36,10 @@
"c": " a/helloworld.txt",
"t": "source.diff meta.diff.header.from-file",
"r": {
"dark_plus": "meta.diff.header: #569CD6",
"light_plus": "meta.diff.header: #000080",
"dark_vs": "meta.diff.header: #569CD6",
"light_vs": "meta.diff.header: #000080",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "meta.diff.header: #000080"
}
},
@@ -47,10 +47,10 @@
"c": "+++",
"t": "source.diff meta.diff.header.to-file punctuation.definition.to-file.diff",
"r": {
"dark_plus": "meta.diff.header: #569CD6",
"light_plus": "meta.diff.header: #000080",
"dark_vs": "meta.diff.header: #569CD6",
"light_vs": "meta.diff.header: #000080",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "meta.diff.header: #000080"
}
},
@@ -58,10 +58,10 @@
"c": " b/helloworld.txt",
"t": "source.diff meta.diff.header.to-file",
"r": {
"dark_plus": "meta.diff.header: #569CD6",
"light_plus": "meta.diff.header: #000080",
"dark_vs": "meta.diff.header: #569CD6",
"light_vs": "meta.diff.header: #000080",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "meta.diff.header: #000080"
}
},
@@ -69,10 +69,10 @@
"c": "@@",
"t": "source.diff meta.diff.range.unified punctuation.definition.range.diff",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -80,10 +80,10 @@
"c": " ",
"t": "source.diff meta.diff.range.unified",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -91,10 +91,10 @@
"c": "-1 +1",
"t": "source.diff meta.diff.range.unified meta.toc-list.line-number.diff",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -102,10 +102,10 @@
"c": " ",
"t": "source.diff meta.diff.range.unified",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -113,10 +113,10 @@
"c": "@@",
"t": "source.diff meta.diff.range.unified punctuation.definition.range.diff",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -124,10 +124,10 @@
"c": "-",
"t": "source.diff markup.deleted.diff punctuation.definition.deleted.diff",
"r": {
"dark_plus": "markup.deleted: #CE9178",
"light_plus": "markup.deleted: #A31515",
"dark_vs": "markup.deleted: #CE9178",
"light_vs": "markup.deleted: #A31515",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "markup.deleted: #CE9178"
}
},
@@ -135,10 +135,10 @@
"c": "Hello world",
"t": "source.diff markup.deleted.diff",
"r": {
"dark_plus": "markup.deleted: #CE9178",
"light_plus": "markup.deleted: #A31515",
"dark_vs": "markup.deleted: #CE9178",
"light_vs": "markup.deleted: #A31515",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "markup.deleted: #CE9178"
}
},
@@ -146,10 +146,10 @@
"c": "+",
"t": "source.diff markup.inserted.diff punctuation.definition.inserted.diff",
"r": {
"dark_plus": "markup.inserted: #B5CEA8",
"light_plus": "markup.inserted: #09885A",
"dark_vs": "markup.inserted: #B5CEA8",
"light_vs": "markup.inserted: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "markup.inserted: #B5CEA8"
}
},
@@ -157,10 +157,10 @@
"c": "Hello World",
"t": "source.diff markup.inserted.diff",
"r": {
"dark_plus": "markup.inserted: #B5CEA8",
"light_plus": "markup.inserted: #09885A",
"dark_vs": "markup.inserted: #B5CEA8",
"light_vs": "markup.inserted: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "markup.inserted: #B5CEA8"
}
}

392
extensions/git/test/colorize-results/git-rebase-todo.json
View File

@@ -3,10 +3,10 @@
"c": "pick",
"t": "text.git-rebase meta.commit-command.git-rebase support.function.git-rebase",
"r": {
"dark_plus": "support.function.git-rebase: #9CDCFE",
"light_plus": "support.function.git-rebase: #0451A5",
"dark_vs": "support.function.git-rebase: #9CDCFE",
"light_vs": "support.function.git-rebase: #0451A5",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "support.function.git-rebase: #D4D4D4"
}
},
@@ -14,10 +14,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -25,10 +25,10 @@
"c": "1fc6c95",
"t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase",
"r": {
"dark_plus": "constant.sha.git-rebase: #B5CEA8",
"light_plus": "constant.sha.git-rebase: #09885A",
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
"light_vs": "constant.sha.git-rebase: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "constant.sha.git-rebase: #B5CEA8"
}
},
@@ -36,10 +36,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -47,10 +47,10 @@
"c": "Patch A",
"t": "text.git-rebase meta.commit-command.git-rebase meta.commit-message.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -58,10 +58,10 @@
"c": "squash",
"t": "text.git-rebase meta.commit-command.git-rebase support.function.git-rebase",
"r": {
"dark_plus": "support.function.git-rebase: #9CDCFE",
"light_plus": "support.function.git-rebase: #0451A5",
"dark_vs": "support.function.git-rebase: #9CDCFE",
"light_vs": "support.function.git-rebase: #0451A5",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "support.function.git-rebase: #D4D4D4"
}
},
@@ -69,10 +69,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -80,10 +80,10 @@
"c": "fa39187",
"t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase",
"r": {
"dark_plus": "constant.sha.git-rebase: #B5CEA8",
"light_plus": "constant.sha.git-rebase: #09885A",
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
"light_vs": "constant.sha.git-rebase: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "constant.sha.git-rebase: #B5CEA8"
}
},
@@ -91,10 +91,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -102,10 +102,10 @@
"c": "Something to add to patch A",
"t": "text.git-rebase meta.commit-command.git-rebase meta.commit-message.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -113,10 +113,10 @@
"c": "pick",
"t": "text.git-rebase meta.commit-command.git-rebase support.function.git-rebase",
"r": {
"dark_plus": "support.function.git-rebase: #9CDCFE",
"light_plus": "support.function.git-rebase: #0451A5",
"dark_vs": "support.function.git-rebase: #9CDCFE",
"light_vs": "support.function.git-rebase: #0451A5",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "support.function.git-rebase: #D4D4D4"
}
},
@@ -124,10 +124,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -135,10 +135,10 @@
"c": "7b36971",
"t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase",
"r": {
"dark_plus": "constant.sha.git-rebase: #B5CEA8",
"light_plus": "constant.sha.git-rebase: #09885A",
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
"light_vs": "constant.sha.git-rebase: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "constant.sha.git-rebase: #B5CEA8"
}
},
@@ -146,10 +146,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -157,10 +157,10 @@
"c": "Something to move before patch B",
"t": "text.git-rebase meta.commit-command.git-rebase meta.commit-message.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -168,10 +168,10 @@
"c": "pick",
"t": "text.git-rebase meta.commit-command.git-rebase support.function.git-rebase",
"r": {
"dark_plus": "support.function.git-rebase: #9CDCFE",
"light_plus": "support.function.git-rebase: #0451A5",
"dark_vs": "support.function.git-rebase: #9CDCFE",
"light_vs": "support.function.git-rebase: #0451A5",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "support.function.git-rebase: #D4D4D4"
}
},
@@ -179,10 +179,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -190,10 +190,10 @@
"c": "6b2481b",
"t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase",
"r": {
"dark_plus": "constant.sha.git-rebase: #B5CEA8",
"light_plus": "constant.sha.git-rebase: #09885A",
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
"light_vs": "constant.sha.git-rebase: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "constant.sha.git-rebase: #B5CEA8"
}
},
@@ -201,10 +201,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -212,10 +212,10 @@
"c": "Patch B",
"t": "text.git-rebase meta.commit-command.git-rebase meta.commit-message.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -223,10 +223,10 @@
"c": "fixup",
"t": "text.git-rebase meta.commit-command.git-rebase support.function.git-rebase",
"r": {
"dark_plus": "support.function.git-rebase: #9CDCFE",
"light_plus": "support.function.git-rebase: #0451A5",
"dark_vs": "support.function.git-rebase: #9CDCFE",
"light_vs": "support.function.git-rebase: #0451A5",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "support.function.git-rebase: #D4D4D4"
}
},
@@ -234,10 +234,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -245,10 +245,10 @@
"c": "c619268",
"t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase",
"r": {
"dark_plus": "constant.sha.git-rebase: #B5CEA8",
"light_plus": "constant.sha.git-rebase: #09885A",
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
"light_vs": "constant.sha.git-rebase: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "constant.sha.git-rebase: #B5CEA8"
}
},
@@ -256,10 +256,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -267,10 +267,10 @@
"c": "A fix for Patch B",
"t": "text.git-rebase meta.commit-command.git-rebase meta.commit-message.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -278,10 +278,10 @@
"c": "edit",
"t": "text.git-rebase meta.commit-command.git-rebase support.function.git-rebase",
"r": {
"dark_plus": "support.function.git-rebase: #9CDCFE",
"light_plus": "support.function.git-rebase: #0451A5",
"dark_vs": "support.function.git-rebase: #9CDCFE",
"light_vs": "support.function.git-rebase: #0451A5",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "support.function.git-rebase: #D4D4D4"
}
},
@@ -289,10 +289,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -300,10 +300,10 @@
"c": "dd1475d",
"t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase",
"r": {
"dark_plus": "constant.sha.git-rebase: #B5CEA8",
"light_plus": "constant.sha.git-rebase: #09885A",
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
"light_vs": "constant.sha.git-rebase: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "constant.sha.git-rebase: #B5CEA8"
}
},
@@ -311,10 +311,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -322,10 +322,10 @@
"c": "Something I want to split",
"t": "text.git-rebase meta.commit-command.git-rebase meta.commit-message.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -333,10 +333,10 @@
"c": "reword",
"t": "text.git-rebase meta.commit-command.git-rebase support.function.git-rebase",
"r": {
"dark_plus": "support.function.git-rebase: #9CDCFE",
"light_plus": "support.function.git-rebase: #0451A5",
"dark_vs": "support.function.git-rebase: #9CDCFE",
"light_vs": "support.function.git-rebase: #0451A5",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "support.function.git-rebase: #D4D4D4"
}
},
@@ -344,10 +344,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -355,10 +355,10 @@
"c": "4ca2acc",
"t": "text.git-rebase meta.commit-command.git-rebase constant.sha.git-rebase",
"r": {
"dark_plus": "constant.sha.git-rebase: #B5CEA8",
"light_plus": "constant.sha.git-rebase: #09885A",
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
"light_vs": "constant.sha.git-rebase: #09885A",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "constant.sha.git-rebase: #B5CEA8"
}
},
@@ -366,10 +366,10 @@
"c": " ",
"t": "text.git-rebase meta.commit-command.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -377,10 +377,10 @@
"c": "i cant' typ goods",
"t": "text.git-rebase meta.commit-command.git-rebase meta.commit-message.git-rebase",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "default: #FFFFFF"
}
},
@@ -388,10 +388,10 @@
"c": "#",
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -399,10 +399,10 @@
"c": " Commands:",
"t": "text.git-rebase comment.line.number-sign.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -410,10 +410,10 @@
"c": "#",
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -421,10 +421,10 @@
"c": " p, pick = use commit",
"t": "text.git-rebase comment.line.number-sign.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -432,10 +432,10 @@
"c": "#",
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -443,10 +443,10 @@
"c": " r, reword = use commit, but edit the commit message",
"t": "text.git-rebase comment.line.number-sign.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -454,10 +454,10 @@
"c": "#",
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -465,10 +465,10 @@
"c": " e, edit = use commit, but stop for amending",
"t": "text.git-rebase comment.line.number-sign.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -476,10 +476,10 @@
"c": "#",
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -487,10 +487,10 @@
"c": " s, squash = use commit, but meld into previous commit",
"t": "text.git-rebase comment.line.number-sign.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -498,10 +498,10 @@
"c": "#",
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -509,10 +509,10 @@
"c": " f, fixup = like \"squash\", but discard this commit's log message",
"t": "text.git-rebase comment.line.number-sign.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -520,10 +520,10 @@
"c": "#",
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
},
@@ -531,10 +531,10 @@
"c": " x, exec = run command (the rest of the line) using shell",
"t": "text.git-rebase comment.line.number-sign.git-rebase",
"r": {
"dark_plus": "comment: #608B4E",
"light_plus": "comment: #008000",
"dark_vs": "comment: #608B4E",
"light_vs": "comment: #008000",
"dark_plus": null,
"light_plus": null,
"dark_vs": null,
"light_vs": null,
"hc_black": "comment: #7CA668"
}
}