Archived
Merge vscode 1.67 (#20883)
* Fix initial build breaks from 1.67 merge (#2514) * Update yarn lock files * Update build scripts * Fix tsconfig * Build breaks * WIP * Update yarn lock files * Misc breaks * Updates to package.json * Breaks * Update yarn * Fix breaks * Breaks * Build breaks * Breaks * Breaks * Breaks * Breaks * Breaks * Missing file * Breaks * Breaks * Breaks * Breaks * Breaks * Fix several runtime breaks (#2515) * Missing files * Runtime breaks * Fix proxy ordering issue * Remove commented code * Fix breaks with opening query editor * Fix post merge break * Updates related to setup build and other breaks (#2516) * Fix bundle build issues * Update distro * Fix distro merge and update build JS files * Disable pipeline steps * Remove stats call * Update license name * Make new RPM dependencies a warning * Fix extension manager version checks * Update JS file * Fix a few runtime breaks * Fixes * Fix runtime issues * Fix build breaks * Update notebook tests (part 1) * Fix broken tests * Linting errors * Fix hygiene * Disable lint rules * Bump distro * Turn off smoke tests * Disable integration tests * Remove failing "activate" test * Remove failed test assertion * Disable other broken test * Disable query history tests * Disable extension unit tests * Disable failing tasks
This commit is contained in:
Karl Burtram
@@ -0,0 +1,13 @@
|
||||
This is the summary line. It can't be too long.
|
||||
After I can write a much more detailed description without quite the same restrictions on length.
|
||||
|
||||
# Please enter the commit message for your changes. Lines starting
|
||||
# with '#' will be ignored, and an empty message aborts the commit.
|
||||
# On branch master
|
||||
# Your branch is up-to-date with 'origin/master'.
|
||||
#
|
||||
# Changes to be committed:
|
||||
# deleted: README.md
|
||||
# modified: index.less
|
||||
# new file: spec/COMMIT_EDITMSG
|
||||
#
|
||||
@@ -0,0 +1,15 @@
|
||||
pick 1fc6c95 Patch A
|
||||
squash fa39187 Something to add to patch A
|
||||
pick 7b36971 Something to move before patch B
|
||||
pick 6b2481b Patch B
|
||||
fixup c619268 A fix for Patch B
|
||||
edit dd1475d Something I want to split
|
||||
reword 4ca2acc i cant' typ goods
|
||||
|
||||
# Commands:
|
||||
# p, pick = use commit
|
||||
# r, reword = use commit, but edit the commit message
|
||||
# e, edit = use commit, but stop for amending
|
||||
# s, squash = use commit, but meld into previous commit
|
||||
# f, fixup = like "squash", but discard this commit's log message
|
||||
# x, exec = run command (the rest of the line) using shell
|
||||
@@ -0,0 +1,22 @@
|
||||
% a sample bibliography file
|
||||
%
|
||||
|
||||
@article{small,
|
||||
author = {Freely, I.P.},
|
||||
title = {A small paper},
|
||||
journal = {The journal of small papers},
|
||||
year = 1997,
|
||||
volume = {-1},
|
||||
note = {to appear},
|
||||
}
|
||||
|
||||
@article{big,
|
||||
author = {Jass, Hugh},
|
||||
title = {A big paper},
|
||||
journal = {The journal of big papers},
|
||||
year = 7991,
|
||||
volume = {MCMXCVII},
|
||||
}
|
||||
|
||||
% The authors mentioned here are almost, but not quite,
|
||||
% entirely unrelated to Matt Groening.
|
||||
@@ -0,0 +1,7 @@
|
||||
diff --git a/helloworld.txt b/helloworld.txt
|
||||
index e4f37c4..557db03 100644
|
||||
--- a/helloworld.txt
|
||||
+++ b/helloworld.txt
|
||||
@@ -1 +1 @@
|
||||
-Hello world
|
||||
+Hello World
|
||||
@@ -0,0 +1,98 @@
|
||||
*italics*, **bold**, ``literal``.
|
||||
|
||||
1. A list
|
||||
2. With items
|
||||
- With sub-lists ...
|
||||
- ... of things.
|
||||
3. Other things
|
||||
|
||||
definition list
|
||||
A list of terms and their definition
|
||||
|
||||
Literal block::
|
||||
|
||||
x = 2 + 3
|
||||
|
||||
|
||||
Section separators are all interchangeable.
|
||||
|
||||
=====
|
||||
Title
|
||||
=====
|
||||
|
||||
--------
|
||||
Subtitle
|
||||
--------
|
||||
|
||||
Section 1
|
||||
=========
|
||||
|
||||
Section 2
|
||||
---------
|
||||
|
||||
Section 3
|
||||
~~~~~~~~~
|
||||
|
||||
| Keeping line
|
||||
| breaks.
|
||||
|
||||
|
||||
+-------------+--------------+
|
||||
| Fancy table | with columns |
|
||||
+=============+==============+
|
||||
| row 1, col 1| row 1, col 2 |
|
||||
+-------------+--------------+
|
||||
|
||||
============ ============
|
||||
Simple table with columns
|
||||
============ ============
|
||||
row 1, col1 row 1, col 2
|
||||
============ ============
|
||||
|
||||
Block quote is indented.
|
||||
|
||||
This space intentionally not important.
|
||||
|
||||
Doctest block
|
||||
|
||||
>>> 2 +3
|
||||
5
|
||||
|
||||
A footnote [#note]_.
|
||||
|
||||
.. [#note] https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#footnotes
|
||||
|
||||
|
||||
Citation [cite]_.
|
||||
|
||||
.. [cite] https://bing.com
|
||||
|
||||
a simple link_.
|
||||
|
||||
A `fancier link`_ .
|
||||
|
||||
.. _link: https://docutils.sourceforge.io/
|
||||
.. _fancier link: https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
|
||||
|
||||
|
||||
An `inline link <https://code.visualstudio.com>`__ .
|
||||
|
||||
.. image:: https://code.visualstudio.com/assets/images/code-stable.png
|
||||
|
||||
.. function: example()
|
||||
:module: mod
|
||||
|
||||
|
||||
:sub:`subscript`
|
||||
:sup:`superscript`
|
||||
|
||||
.. This is a comment.
|
||||
|
||||
..
|
||||
And a bigger,
|
||||
longer comment.
|
||||
|
||||
|
||||
A |subst| of something.
|
||||
|
||||
.. |subst| replace:: substitution
|
||||
@@ -0,0 +1,20 @@
|
||||
\message{Document style option `aer.sty' (29 May 1993) for LaTeX 2.09.}
|
||||
\textwidth=28pc
|
||||
\textheight=46pc
|
||||
|
||||
\def\bysame{\leavevmode\hbox to\leftmargin{\leaders\hrule height 3pt depth -2.5pt\hfill\,\,}}
|
||||
|
||||
\def\thebibliography#1{\section*{\refname\@mkboth
|
||||
{\uppercase{\refname}}{\uppercase{\refname}}}\list
|
||||
{\@biblabel{\arabic{enumiv}}}{\labelwidth=12pt
|
||||
\labelsep=0pt
|
||||
\leftmargin\labelwidth
|
||||
\advance\leftmargin\labelsep
|
||||
\itemsep=0pt\parsep=0pt
|
||||
\usecounter{enumiv}%
|
||||
\let\p@enumiv\@empty
|
||||
\def\theenumiv{\arabic{enumiv}}}%
|
||||
\def\newblock{\hskip .11em plus.33em minus.07em}%
|
||||
\sloppy\clubpenalty4000\widowpenalty4000
|
||||
\raggedright
|
||||
\sfcode`\.=1000\relax}
|
||||
@@ -0,0 +1,20 @@
|
||||
\documentclass[12pt]{article}
|
||||
\usepackage{lingmacros}
|
||||
\usepackage{tree-dvips}
|
||||
\begin{document}
|
||||
|
||||
\section*{Notes for My Paper}
|
||||
|
||||
Don't forget to include examples of topicalization.
|
||||
They look like this:
|
||||
|
||||
{\small
|
||||
\enumsentence{Topicalization from sentential subject:\\
|
||||
\shortex{7}{a John$_i$ [a & kltukl & [el &
|
||||
{\bf l-}oltoir & er & ngii$_i$ & a Mary]]}
|
||||
{ & {\bf R-}clear & {\sc comp} &
|
||||
{\bf IR}.{\sc 3s}-love & P & him & }
|
||||
{John, (it's) clear that Mary loves (him).}}
|
||||
}
|
||||
|
||||
\end{document}
|
||||
@@ -0,0 +1,278 @@
|
||||
[
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": " On branch master",
|
||||
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": " Changes to be committed:",
|
||||
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "\t",
|
||||
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "markup.deleted: #CE9178",
|
||||
"hc_light": "markup.deleted: #5A5A5A"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "\t",
|
||||
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "markup.changed: #569CD6",
|
||||
"hc_light": "markup.changed: #0451A5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "\t",
|
||||
"t": "text.git-commit meta.scope.metadata.git-commit comment.line.number-sign.git-commit",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #098658",
|
||||
"dark_vs": "markup.inserted: #B5CEA8",
|
||||
"light_vs": "markup.inserted: #098658",
|
||||
"hc_black": "markup.inserted: #B5CEA8",
|
||||
"hc_light": "markup.inserted: #096D48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,590 @@
|
||||
[
|
||||
{
|
||||
"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",
|
||||
"hc_black": "support.function.git-rebase: #D4D4D4",
|
||||
"hc_light": "support.function.git-rebase: #0451A5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #098658",
|
||||
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
|
||||
"light_vs": "constant.sha.git-rebase: #098658",
|
||||
"hc_black": "constant.sha.git-rebase: #B5CEA8",
|
||||
"hc_light": "constant.sha.git-rebase: #096D48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "support.function.git-rebase: #D4D4D4",
|
||||
"hc_light": "support.function.git-rebase: #0451A5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #098658",
|
||||
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
|
||||
"light_vs": "constant.sha.git-rebase: #098658",
|
||||
"hc_black": "constant.sha.git-rebase: #B5CEA8",
|
||||
"hc_light": "constant.sha.git-rebase: #096D48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "support.function.git-rebase: #D4D4D4",
|
||||
"hc_light": "support.function.git-rebase: #0451A5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #098658",
|
||||
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
|
||||
"light_vs": "constant.sha.git-rebase: #098658",
|
||||
"hc_black": "constant.sha.git-rebase: #B5CEA8",
|
||||
"hc_light": "constant.sha.git-rebase: #096D48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "support.function.git-rebase: #D4D4D4",
|
||||
"hc_light": "support.function.git-rebase: #0451A5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #098658",
|
||||
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
|
||||
"light_vs": "constant.sha.git-rebase: #098658",
|
||||
"hc_black": "constant.sha.git-rebase: #B5CEA8",
|
||||
"hc_light": "constant.sha.git-rebase: #096D48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "support.function.git-rebase: #D4D4D4",
|
||||
"hc_light": "support.function.git-rebase: #0451A5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #098658",
|
||||
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
|
||||
"light_vs": "constant.sha.git-rebase: #098658",
|
||||
"hc_black": "constant.sha.git-rebase: #B5CEA8",
|
||||
"hc_light": "constant.sha.git-rebase: #096D48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "support.function.git-rebase: #D4D4D4",
|
||||
"hc_light": "support.function.git-rebase: #0451A5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #098658",
|
||||
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
|
||||
"light_vs": "constant.sha.git-rebase: #098658",
|
||||
"hc_black": "constant.sha.git-rebase: #B5CEA8",
|
||||
"hc_light": "constant.sha.git-rebase: #096D48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "support.function.git-rebase: #D4D4D4",
|
||||
"hc_light": "support.function.git-rebase: #0451A5"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #098658",
|
||||
"dark_vs": "constant.sha.git-rebase: #B5CEA8",
|
||||
"light_vs": "constant.sha.git-rebase: #098658",
|
||||
"hc_black": "constant.sha.git-rebase: #B5CEA8",
|
||||
"hc_light": "constant.sha.git-rebase: #096D48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "#",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": " Commands:",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "#",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": " p, pick = use commit",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "#",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": " r, reword = use commit, but edit the commit message",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "#",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": " e, edit = use commit, but stop for amending",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "#",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": " s, squash = use commit, but meld into previous commit",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "#",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "#",
|
||||
"t": "text.git-rebase comment.line.number-sign.git-rebase punctuation.definition.comment.git-rebase",
|
||||
"r": {
|
||||
"dark_plus": "comment: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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: #6A9955",
|
||||
"light_plus": "comment: #008000",
|
||||
"dark_vs": "comment: #6A9955",
|
||||
"light_vs": "comment: #008000",
|
||||
"hc_black": "comment: #7CA668",
|
||||
"hc_light": "comment: #515151"
|
||||
}
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,182 @@
|
||||
[
|
||||
{
|
||||
"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",
|
||||
"hc_black": "meta.diff.header: #000080",
|
||||
"hc_light": "meta.diff.header: #062F4A"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "meta.diff.header: #000080",
|
||||
"hc_light": "meta.diff.header: #062F4A"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "meta.diff.header: #000080",
|
||||
"hc_light": "meta.diff.header: #062F4A"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "meta.diff.header: #000080",
|
||||
"hc_light": "meta.diff.header: #062F4A"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "meta.diff.header: #000080",
|
||||
"hc_light": "meta.diff.header: #062F4A"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "default: #FFFFFF",
|
||||
"hc_light": "default: #292929"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "markup.deleted: #CE9178",
|
||||
"hc_light": "markup.deleted: #5A5A5A"
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"hc_black": "markup.deleted: #CE9178",
|
||||
"hc_light": "markup.deleted: #5A5A5A"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "+",
|
||||
"t": "source.diff markup.inserted.diff punctuation.definition.inserted.diff",
|
||||
"r": {
|
||||
"dark_plus": "markup.inserted: #B5CEA8",
|
||||
"light_plus": "markup.inserted: #098658",
|
||||
"dark_vs": "markup.inserted: #B5CEA8",
|
||||
"light_vs": "markup.inserted: #098658",
|
||||
"hc_black": "markup.inserted: #B5CEA8",
|
||||
"hc_light": "markup.inserted: #096D48"
|
||||
}
|
||||
},
|
||||
{
|
||||
"c": "Hello World",
|
||||
"t": "source.diff markup.inserted.diff",
|
||||
"r": {
|
||||
"dark_plus": "markup.inserted: #B5CEA8",
|
||||
"light_plus": "markup.inserted: #098658",
|
||||
"dark_vs": "markup.inserted: #B5CEA8",
|
||||
"light_vs": "markup.inserted: #098658",
|
||||
"hc_black": "markup.inserted: #B5CEA8",
|
||||
"hc_light": "markup.inserted: #096D48"
|
||||
}
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user