@codingame/monaco-vscode-scm-service-override 15.0.2 → 16.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +17 -13
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/activity.js +24 -12
- package/vscode/src/vs/workbench/contrib/scm/browser/media/dirtydiffDecorator.css +96 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css +525 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/menus.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.js +6 -6
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js +15 -15
- package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js +96 -81
- package/vscode/src/vs/workbench/contrib/scm/browser/scmAccessibilityHelp.js +30 -30
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js +45 -46
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js +8 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoryRenderer.js +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js +30 -27
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.d.ts +22 -5
- package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.js +52 -9
- package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/scm/browser/workingSet.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/media/dirtydiffDecorator.css.js +0 -6
- package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css.js +0 -6
|
@@ -0,0 +1,525 @@
|
|
|
1
|
+
.scm-view {
|
|
2
|
+
height: 100%;
|
|
3
|
+
position: relative;
|
|
4
|
+
}
|
|
5
|
+
.scm-overflow-widgets-container {
|
|
6
|
+
position: absolute;
|
|
7
|
+
top: 0;
|
|
8
|
+
left: 0;
|
|
9
|
+
width: 0;
|
|
10
|
+
height: 0;
|
|
11
|
+
overflow: visible;
|
|
12
|
+
z-index: 5000;
|
|
13
|
+
}
|
|
14
|
+
.scm-view .monaco-tl-contents > div {
|
|
15
|
+
padding-right: 12px;
|
|
16
|
+
overflow: hidden;
|
|
17
|
+
}
|
|
18
|
+
.scm-view .count {
|
|
19
|
+
display: flex;
|
|
20
|
+
margin-left: 6px;
|
|
21
|
+
}
|
|
22
|
+
.scm-view .count.hidden {
|
|
23
|
+
display: none;
|
|
24
|
+
}
|
|
25
|
+
.scm-view .scm-provider {
|
|
26
|
+
display: flex;
|
|
27
|
+
flex-direction: column;
|
|
28
|
+
height: 100%;
|
|
29
|
+
align-items: center;
|
|
30
|
+
flex-flow: nowrap;
|
|
31
|
+
}
|
|
32
|
+
.scm-view.hide-provider-counts .scm-provider > .count,
|
|
33
|
+
.scm-view.auto-provider-counts .scm-provider > .count[data-count="0"] {
|
|
34
|
+
display: none;
|
|
35
|
+
}
|
|
36
|
+
.scm-view .scm-provider > .label {
|
|
37
|
+
flex: 1;
|
|
38
|
+
overflow: hidden;
|
|
39
|
+
text-overflow: ellipsis;
|
|
40
|
+
min-width: 50px;
|
|
41
|
+
}
|
|
42
|
+
.scm-view .scm-provider > .label > .name {
|
|
43
|
+
font-weight: bold;
|
|
44
|
+
}
|
|
45
|
+
.scm-view .scm-provider > .label > .description {
|
|
46
|
+
opacity: 0.7;
|
|
47
|
+
margin-left: 0.5em;
|
|
48
|
+
font-size: 0.9em;
|
|
49
|
+
}
|
|
50
|
+
.scm-view .scm-provider > .actions {
|
|
51
|
+
overflow: hidden;
|
|
52
|
+
justify-content: flex-end;
|
|
53
|
+
}
|
|
54
|
+
.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item {
|
|
55
|
+
padding-left: 4px;
|
|
56
|
+
display: flex;
|
|
57
|
+
align-items: center;
|
|
58
|
+
}
|
|
59
|
+
.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item:nth-child(1) {
|
|
60
|
+
min-width: 20px;
|
|
61
|
+
}
|
|
62
|
+
.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label,
|
|
63
|
+
.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .monaco-dropdown > .dropdown-label > .action-label {
|
|
64
|
+
display: flex;
|
|
65
|
+
align-items: center;
|
|
66
|
+
line-height: 16px;
|
|
67
|
+
overflow: hidden;
|
|
68
|
+
}
|
|
69
|
+
.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label > .codicon {
|
|
70
|
+
font-size: 12px;
|
|
71
|
+
justify-content: center;
|
|
72
|
+
}
|
|
73
|
+
.scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item:last-of-type {
|
|
74
|
+
padding-right: 0;
|
|
75
|
+
}
|
|
76
|
+
.scm-view .scm-provider > .body {
|
|
77
|
+
flex-grow: 1;
|
|
78
|
+
}
|
|
79
|
+
.scm-view .scm-provider > .status > .monaco-action-bar > .actions-container {
|
|
80
|
+
border-color: var(--vscode-sideBar-border);
|
|
81
|
+
}
|
|
82
|
+
.scm-view .monaco-list-row {
|
|
83
|
+
line-height: 22px;
|
|
84
|
+
}
|
|
85
|
+
.scm-view .monaco-list-row .monaco-icon-label-container {
|
|
86
|
+
height: 22px;
|
|
87
|
+
}
|
|
88
|
+
.scm-view .monaco-list-row .history,
|
|
89
|
+
.scm-view .monaco-list-row .history-item-group,
|
|
90
|
+
.scm-view .monaco-list-row .resource-group {
|
|
91
|
+
display: flex;
|
|
92
|
+
height: 100%;
|
|
93
|
+
align-items: center;
|
|
94
|
+
}
|
|
95
|
+
.scm-view .monaco-list-row .history-item-group .monaco-icon-label,
|
|
96
|
+
.scm-view .monaco-list-row .history-item .monaco-icon-label {
|
|
97
|
+
flex-grow: 1;
|
|
98
|
+
align-items: center;
|
|
99
|
+
}
|
|
100
|
+
.scm-view .monaco-list-row .history-item {
|
|
101
|
+
display: flex;
|
|
102
|
+
align-items: center;
|
|
103
|
+
}
|
|
104
|
+
.scm-view .monaco-list-row .history-item > .graph-container {
|
|
105
|
+
display: flex;
|
|
106
|
+
flex-shrink: 0;
|
|
107
|
+
height: 22px;
|
|
108
|
+
}
|
|
109
|
+
.scm-view .monaco-list-row .history-item > .graph-container.current > .graph > circle:last-child {
|
|
110
|
+
fill: var(--vscode-sideBar-background);
|
|
111
|
+
}
|
|
112
|
+
.scm-view .monaco-list-row:hover .history-item > .graph-container.current > .graph > circle:last-child {
|
|
113
|
+
fill: var(--vscode-list-hoverBackground);
|
|
114
|
+
}
|
|
115
|
+
.scm-view .monaco-list-row .history-item > .graph-container > .graph > circle {
|
|
116
|
+
stroke: var(--vscode-sideBar-background);
|
|
117
|
+
}
|
|
118
|
+
.scm-view .monaco-list-row:hover .history-item > .graph-container > .graph > circle:first-of-type {
|
|
119
|
+
stroke: transparent;
|
|
120
|
+
}
|
|
121
|
+
.scm-view .monaco-list-row .history-item > .label-container {
|
|
122
|
+
display: flex;
|
|
123
|
+
flex-shrink: 0;
|
|
124
|
+
gap: 4px;
|
|
125
|
+
}
|
|
126
|
+
.scm-view .monaco-list-row .history-item > .label-container > .label {
|
|
127
|
+
display: flex;
|
|
128
|
+
align-items: center;
|
|
129
|
+
border-radius: 10px;
|
|
130
|
+
line-height: 18px;
|
|
131
|
+
}
|
|
132
|
+
.scm-view .monaco-list-row .history-item > .label-container > .label > .count {
|
|
133
|
+
font-size: 12px;
|
|
134
|
+
margin-left: 0;
|
|
135
|
+
padding-left: 4px;
|
|
136
|
+
}
|
|
137
|
+
.scm-view .monaco-list-row .history-item > .label-container > .label > .codicon {
|
|
138
|
+
font-size: 14px;
|
|
139
|
+
color: inherit !important;
|
|
140
|
+
padding: 2px;
|
|
141
|
+
}
|
|
142
|
+
.scm-view .monaco-list-row .history-item > .label-container > .label > .codicon.codicon-git-branch {
|
|
143
|
+
font-size: 12px;
|
|
144
|
+
padding: 3px;
|
|
145
|
+
}
|
|
146
|
+
.scm-view .monaco-list-row .history-item > .label-container > .label > .description {
|
|
147
|
+
font-size: 12px;
|
|
148
|
+
padding-right: 4px;
|
|
149
|
+
overflow: hidden;
|
|
150
|
+
text-overflow: ellipsis;
|
|
151
|
+
max-width: 100px;
|
|
152
|
+
}
|
|
153
|
+
.scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container {
|
|
154
|
+
display: flex;
|
|
155
|
+
padding-right: 4px;
|
|
156
|
+
}
|
|
157
|
+
.scm-view .monaco-list-row .history-item .monaco-icon-label .avatar {
|
|
158
|
+
width: 14px;
|
|
159
|
+
height: 14px;
|
|
160
|
+
border-radius: 14px;
|
|
161
|
+
}
|
|
162
|
+
.scm-view .monaco-list-row .history-item .monaco-icon-label.history-item-current .label-name {
|
|
163
|
+
font-weight: 600;
|
|
164
|
+
}
|
|
165
|
+
.scm-view .monaco-list-row .history-item .monaco-icon-label.history-item-current .label-description {
|
|
166
|
+
font-weight: 500;
|
|
167
|
+
}
|
|
168
|
+
.scm-view .monaco-list-row .history > .name,
|
|
169
|
+
.scm-view .monaco-list-row .resource-group > .name {
|
|
170
|
+
flex: 1;
|
|
171
|
+
overflow: hidden;
|
|
172
|
+
text-overflow: ellipsis;
|
|
173
|
+
}
|
|
174
|
+
.scm-view .monaco-list-row .resource {
|
|
175
|
+
display: flex;
|
|
176
|
+
height: 100%;
|
|
177
|
+
}
|
|
178
|
+
.scm-view .monaco-list-row .resource.faded {
|
|
179
|
+
opacity: 0.7;
|
|
180
|
+
}
|
|
181
|
+
.scm-view .monaco-list-row .resource > .name {
|
|
182
|
+
flex: 1;
|
|
183
|
+
overflow: hidden;
|
|
184
|
+
}
|
|
185
|
+
.scm-view .monaco-list-row .resource > .name > .monaco-icon-label::after {
|
|
186
|
+
margin-right: 3px;
|
|
187
|
+
}
|
|
188
|
+
.scm-view .monaco-list-row .resource > .decoration-icon {
|
|
189
|
+
width: 16px;
|
|
190
|
+
height: 100%;
|
|
191
|
+
background-repeat: no-repeat;
|
|
192
|
+
background-position: 50% 50%;
|
|
193
|
+
margin-left: 5px;
|
|
194
|
+
}
|
|
195
|
+
.scm-view .monaco-list-row .resource > .decoration-icon.codicon {
|
|
196
|
+
margin-right: 0;
|
|
197
|
+
margin-top: 3px;
|
|
198
|
+
}
|
|
199
|
+
.scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions {
|
|
200
|
+
flex-grow: 100;
|
|
201
|
+
}
|
|
202
|
+
.scm-view .monaco-list .monaco-list-row .resource-group > .actions,
|
|
203
|
+
.scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions,
|
|
204
|
+
.scm-view .monaco-list .monaco-list-row .history-item > .actions {
|
|
205
|
+
display: none;
|
|
206
|
+
max-width: fit-content;
|
|
207
|
+
}
|
|
208
|
+
.scm-view .monaco-list .monaco-list-row:hover .resource-group > .actions,
|
|
209
|
+
.scm-view .monaco-list .monaco-list-row.focused .resource-group > .actions,
|
|
210
|
+
.scm-view .monaco-list .monaco-list-row:hover .resource > .name > .monaco-icon-label > .actions,
|
|
211
|
+
.scm-view .monaco-list .monaco-list-row.focused .resource > .name > .monaco-icon-label > .actions,
|
|
212
|
+
.scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover > .actions,
|
|
213
|
+
.scm-view .monaco-list .monaco-list-row:hover .history-item > .actions,
|
|
214
|
+
.scm-view .monaco-list .monaco-list-row.focused .history-item > .actions {
|
|
215
|
+
display: block;
|
|
216
|
+
}
|
|
217
|
+
.scm-view .monaco-list .monaco-list-row.force-no-hover,
|
|
218
|
+
.scm-view .monaco-list .monaco-list-row:hover.force-no-hover,
|
|
219
|
+
.scm-view .monaco-list .monaco-list-row.focused.force-no-hover,
|
|
220
|
+
.scm-view .monaco-list .monaco-list-row.selected.force-no-hover {
|
|
221
|
+
background: transparent !important;
|
|
222
|
+
}
|
|
223
|
+
.scm-view .monaco-list .monaco-list-row.cursor-default {
|
|
224
|
+
cursor: default;
|
|
225
|
+
}
|
|
226
|
+
.scm-view.show-actions .scm-provider > .actions,
|
|
227
|
+
.scm-view.show-actions > .monaco-list .monaco-list-row .scm-input > .scm-editor > .actions,
|
|
228
|
+
.scm-view.show-actions > .monaco-list .monaco-list-row .resource-group > .actions,
|
|
229
|
+
.scm-view.show-actions > .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions,
|
|
230
|
+
.scm-view.show-actions > .monaco-list .monaco-list-row .history-item > .actions {
|
|
231
|
+
display: block;
|
|
232
|
+
}
|
|
233
|
+
.scm-view .monaco-list-row .actions .action-label {
|
|
234
|
+
padding: 2px;
|
|
235
|
+
}
|
|
236
|
+
.scm-view .scm-input {
|
|
237
|
+
height: 100%;
|
|
238
|
+
display: flex;
|
|
239
|
+
align-items: center;
|
|
240
|
+
padding-left: 11px;
|
|
241
|
+
}
|
|
242
|
+
.scm-view .scm-input .scm-editor .scm-editor-toolbar {
|
|
243
|
+
padding: 1px 3px 1px 1px;
|
|
244
|
+
}
|
|
245
|
+
.scm-view .scm-input .scm-editor .scm-editor-toolbar.hidden {
|
|
246
|
+
display: none;
|
|
247
|
+
}
|
|
248
|
+
.scm-view .scm-input .scm-editor .scm-editor-toolbar.scroll-decoration {
|
|
249
|
+
box-shadow: var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset;
|
|
250
|
+
}
|
|
251
|
+
.scm-view .scm-input .scm-editor .scm-editor-toolbar .action-label.codicon.codicon-debug-stop {
|
|
252
|
+
color: var(--vscode-icon-foreground) !important;
|
|
253
|
+
}
|
|
254
|
+
.scm-view .scm-editor-container .monaco-editor {
|
|
255
|
+
border-radius: 2px;
|
|
256
|
+
}
|
|
257
|
+
.scm-view .scm-editor {
|
|
258
|
+
box-sizing: border-box;
|
|
259
|
+
width: 100%;
|
|
260
|
+
display: flex;
|
|
261
|
+
align-items: flex-start;
|
|
262
|
+
box-sizing: border-box;
|
|
263
|
+
border: 1px solid var(--vscode-input-border, transparent);
|
|
264
|
+
background-color: var(--vscode-input-background);
|
|
265
|
+
border-radius: 2px;
|
|
266
|
+
}
|
|
267
|
+
.scm-view .button-container {
|
|
268
|
+
display: flex;
|
|
269
|
+
height: 100%;
|
|
270
|
+
padding-left: 11px;
|
|
271
|
+
align-items: center;
|
|
272
|
+
}
|
|
273
|
+
.scm-view .button-container .codicon.codicon-cloud-upload,
|
|
274
|
+
.scm-view .button-container .codicon.codicon-sync {
|
|
275
|
+
margin: 0 4px 0 0;
|
|
276
|
+
}
|
|
277
|
+
.scm-view .button-container .codicon.codicon-arrow-up,
|
|
278
|
+
.scm-view .button-container .codicon.codicon-arrow-down {
|
|
279
|
+
font-size: small !important;
|
|
280
|
+
margin: 0 4px 0 0;
|
|
281
|
+
}
|
|
282
|
+
.scm-view .button-container > .monaco-button-dropdown {
|
|
283
|
+
flex-grow: 1;
|
|
284
|
+
overflow: hidden;
|
|
285
|
+
}
|
|
286
|
+
.scm-view .button-container > .monaco-button-dropdown > .monaco-dropdown-button {
|
|
287
|
+
display:flex;
|
|
288
|
+
align-items: center;
|
|
289
|
+
padding: 0 4px;
|
|
290
|
+
}
|
|
291
|
+
.scm-view .button-container > .monaco-button-dropdown > .monaco-button.monaco-text-button {
|
|
292
|
+
min-width: 0;
|
|
293
|
+
}
|
|
294
|
+
.scm-view .button-container > .monaco-button-dropdown > .monaco-button.monaco-text-button > span:not(.codicon) {
|
|
295
|
+
overflow: hidden;
|
|
296
|
+
text-overflow: ellipsis;
|
|
297
|
+
white-space: nowrap;
|
|
298
|
+
}
|
|
299
|
+
.scm-view .scm-editor.hidden {
|
|
300
|
+
display: none;
|
|
301
|
+
}
|
|
302
|
+
.monaco-workbench .part.panel .scm-view .scm-editor-container {
|
|
303
|
+
outline: 1px solid var(--vscode-panelInput-border);
|
|
304
|
+
}
|
|
305
|
+
.scm-view .scm-editor.synthetic-focus,
|
|
306
|
+
.monaco-workbench .part.panel .scm-view .scm-editor.synthetic-focus {
|
|
307
|
+
outline: 1px solid var(--vscode-focusBorder);
|
|
308
|
+
outline-offset: -1px;
|
|
309
|
+
}
|
|
310
|
+
.scm-view .scm-editor.validation-info {
|
|
311
|
+
outline: 1px solid var(--vscode-inputValidation-infoBorder) !important;
|
|
312
|
+
outline-offset: -1px;
|
|
313
|
+
}
|
|
314
|
+
.scm-view .scm-editor.validation-warning {
|
|
315
|
+
outline: 1px solid var(--vscode-inputValidation-warningBorder) !important;
|
|
316
|
+
outline-offset: -1px;
|
|
317
|
+
}
|
|
318
|
+
.scm-view .scm-editor.validation-error {
|
|
319
|
+
outline: 1px solid var(--vscode-inputValidation-errorBorder) !important;
|
|
320
|
+
outline-offset: -1px;
|
|
321
|
+
}
|
|
322
|
+
.scm-editor-validation-container {
|
|
323
|
+
display: flex;
|
|
324
|
+
box-sizing: border-box;
|
|
325
|
+
border-width: 1px;
|
|
326
|
+
border-style: solid;
|
|
327
|
+
border-top: none;
|
|
328
|
+
border-bottom-left-radius: 2px;
|
|
329
|
+
border-bottom-right-radius: 2px;
|
|
330
|
+
padding: 2px;
|
|
331
|
+
}
|
|
332
|
+
.scm-editor-validation-container.validation-info {
|
|
333
|
+
background-color: var(--vscode-inputValidation-infoBackground);
|
|
334
|
+
border-color: var(--vscode-inputValidation-infoBorder);
|
|
335
|
+
color: var(--vscode-inputValidation-infoForeground);
|
|
336
|
+
}
|
|
337
|
+
.scm-editor-validation-container.validation-warning {
|
|
338
|
+
background-color: var(--vscode-inputValidation-warningBackground);
|
|
339
|
+
border-color: var(--vscode-inputValidation-warningBorder);
|
|
340
|
+
color: var(--vscode-inputValidation-warningForeground);
|
|
341
|
+
}
|
|
342
|
+
.scm-editor-validation-container.validation-error {
|
|
343
|
+
background-color: var(--vscode-inputValidation-errorBackground);
|
|
344
|
+
border-color: var(--vscode-inputValidation-errorBorder);
|
|
345
|
+
color: var(--vscode-inputValidation-errorForeground);
|
|
346
|
+
}
|
|
347
|
+
.scm-editor-validation {
|
|
348
|
+
box-sizing: border-box;
|
|
349
|
+
font-size: 0.9em;
|
|
350
|
+
padding: 1px 3px;
|
|
351
|
+
display: block;
|
|
352
|
+
border-style: none;
|
|
353
|
+
flex: auto;
|
|
354
|
+
}
|
|
355
|
+
.scm-editor-validation p {
|
|
356
|
+
margin: 0;
|
|
357
|
+
padding: 0;
|
|
358
|
+
}
|
|
359
|
+
.scm-editor-validation a {
|
|
360
|
+
color: var(--vscode-textLink-foreground);
|
|
361
|
+
-webkit-user-select: none;
|
|
362
|
+
user-select: none;
|
|
363
|
+
}
|
|
364
|
+
.scm-editor-validation a:active,
|
|
365
|
+
.scm-editor-validation a:hover {
|
|
366
|
+
color: var(--vscode-textLink-activeForeground);
|
|
367
|
+
}
|
|
368
|
+
.scm-editor-validation-actions {
|
|
369
|
+
align-self: start;
|
|
370
|
+
margin-top: 1px;
|
|
371
|
+
}
|
|
372
|
+
.scm-view .scm-editor-container .monaco-editor-background,
|
|
373
|
+
.scm-view .scm-editor-container .monaco-editor,
|
|
374
|
+
.scm-view .scm-editor-container .monaco-editor .margin,
|
|
375
|
+
.monaco-workbench .part.basepanel > .content .scm-view .scm-editor-container .monaco-editor,
|
|
376
|
+
.monaco-workbench .part.basepanel > .content .scm-view .scm-editor-container .monaco-editor .margin,
|
|
377
|
+
.monaco-workbench .part.basepanel > .content .scm-view .scm-editor-container .monaco-editor .monaco-editor-background {
|
|
378
|
+
color: inherit;
|
|
379
|
+
background-color: var(--vscode-input-background);
|
|
380
|
+
}
|
|
381
|
+
.scm-view .scm-editor-container .mtk1 {
|
|
382
|
+
color: var(--vscode-input-foreground);
|
|
383
|
+
}
|
|
384
|
+
.scm-view .scm-editor-container .placeholder-text.mtk1 {
|
|
385
|
+
color: var(--vscode-input-placeholderForeground);
|
|
386
|
+
}
|
|
387
|
+
.scm-repositories-view .scm-provider {
|
|
388
|
+
margin: 0 12px 0 20px;
|
|
389
|
+
overflow: hidden;
|
|
390
|
+
}
|
|
391
|
+
.scm-repositories-view .scm-provider > .label > .name {
|
|
392
|
+
font-weight: normal;
|
|
393
|
+
}
|
|
394
|
+
.monaco-hover.history-item-hover p:first-child {
|
|
395
|
+
margin-top: 4px;
|
|
396
|
+
}
|
|
397
|
+
.monaco-hover.history-item-hover p:last-child {
|
|
398
|
+
margin-bottom: 2px !important;
|
|
399
|
+
}
|
|
400
|
+
.monaco-hover.history-item-hover p:last-child span:not(.codicon) {
|
|
401
|
+
padding: 2px 0;
|
|
402
|
+
}
|
|
403
|
+
.monaco-hover.history-item-hover hr {
|
|
404
|
+
margin-top: 4px;
|
|
405
|
+
margin-bottom: 4px;
|
|
406
|
+
}
|
|
407
|
+
.monaco-hover.history-item-hover hr + p {
|
|
408
|
+
margin: 4px 0;
|
|
409
|
+
}
|
|
410
|
+
.monaco-hover.history-item-hover span:not(.codicon) {
|
|
411
|
+
margin-bottom: 0 !important;
|
|
412
|
+
}
|
|
413
|
+
.monaco-hover.history-item-hover p > span > span.codicon.codicon-git-branch {
|
|
414
|
+
font-size: 12px;
|
|
415
|
+
margin-bottom: 2px !important;
|
|
416
|
+
}
|
|
417
|
+
.monaco-hover.history-item-hover p > span > span.codicon.codicon-tag,
|
|
418
|
+
.monaco-hover.history-item-hover p > span > span.codicon.codicon-target {
|
|
419
|
+
font-size: 14px;
|
|
420
|
+
margin-bottom: 2px !important;
|
|
421
|
+
}
|
|
422
|
+
.monaco-hover.history-item-hover p > span > span.codicon.codicon-cloud {
|
|
423
|
+
font-size: 14px;
|
|
424
|
+
margin-bottom: 1px !important;
|
|
425
|
+
}
|
|
426
|
+
.monaco-hover.history-item-hover .hover-row.status-bar .action {
|
|
427
|
+
display: flex;
|
|
428
|
+
align-items: center;
|
|
429
|
+
}
|
|
430
|
+
.monaco-hover.history-item-hover .hover-row.status-bar .action .codicon {
|
|
431
|
+
color: inherit;
|
|
432
|
+
font-size: 12px;
|
|
433
|
+
}
|
|
434
|
+
.pane-header .scm-graph-view-badge-container {
|
|
435
|
+
display: flex;
|
|
436
|
+
align-items: center;
|
|
437
|
+
min-width: fit-content;
|
|
438
|
+
}
|
|
439
|
+
.pane-header .scm-graph-view-badge-container > .scm-graph-view-badge.monaco-count-badge.long {
|
|
440
|
+
background-color: var(--vscode-badge-background);
|
|
441
|
+
color: var(--vscode-badge-foreground);
|
|
442
|
+
border: 1px solid var(--vscode-contrastBorder);
|
|
443
|
+
margin: 0 6px;
|
|
444
|
+
padding: 2px 4px;
|
|
445
|
+
}
|
|
446
|
+
.monaco-workbench .part.sidebar > .title > .title-actions .action-label.scm-graph-repository-picker,
|
|
447
|
+
.monaco-workbench .part.sidebar > .title > .title-actions .action-label.scm-graph-history-item-picker,
|
|
448
|
+
.monaco-workbench .part.auxiliarybar > .title > .title-actions .action-label.scm-graph-repository-picker,
|
|
449
|
+
.monaco-workbench .part.auxiliarybar > .title > .title-actions .action-label.scm-graph-history-item-picker,
|
|
450
|
+
.monaco-workbench .part.panel > .title > .title-actions .action-label.scm-graph-repository-picker,
|
|
451
|
+
.monaco-workbench .part.panel > .title > .title-actions .action-label.scm-graph-history-item-picker {
|
|
452
|
+
display: flex;
|
|
453
|
+
}
|
|
454
|
+
.monaco-toolbar .action-item > .action-label.scm-graph-repository-picker,
|
|
455
|
+
.monaco-toolbar .action-item > .action-label.scm-graph-history-item-picker {
|
|
456
|
+
color: var(--vscode-icon-foreground);
|
|
457
|
+
align-items: center;
|
|
458
|
+
font-weight: normal;
|
|
459
|
+
line-height: 16px;
|
|
460
|
+
}
|
|
461
|
+
.monaco-toolbar .action-item.disabled > .action-label.scm-graph-repository-picker,
|
|
462
|
+
.monaco-toolbar .action-item.disabled > .action-label.scm-graph-history-item-picker {
|
|
463
|
+
color: var(--vscode-disabledForeground);
|
|
464
|
+
}
|
|
465
|
+
.monaco-toolbar .action-label.scm-graph-repository-picker .codicon,
|
|
466
|
+
.monaco-toolbar .action-label.scm-graph-history-item-picker .codicon {
|
|
467
|
+
font-size: 14px;
|
|
468
|
+
color: inherit;
|
|
469
|
+
}
|
|
470
|
+
.monaco-toolbar .action-label.scm-graph-repository-picker > .name,
|
|
471
|
+
.monaco-toolbar .action-label.scm-graph-history-item-picker > .name {
|
|
472
|
+
max-width: 100px;
|
|
473
|
+
overflow: hidden;
|
|
474
|
+
text-overflow: ellipsis;
|
|
475
|
+
}
|
|
476
|
+
.scm-history-view .scm-provider .label-name {
|
|
477
|
+
font-weight: bold;
|
|
478
|
+
}
|
|
479
|
+
.scm-history-view .scm-provider .monaco-icon-label {
|
|
480
|
+
align-items: center;
|
|
481
|
+
}
|
|
482
|
+
.scm-history-view .scm-provider .state-label.monaco-count-badge.long {
|
|
483
|
+
display: flex;
|
|
484
|
+
font-size: 0.8em;
|
|
485
|
+
margin: 0 10px;
|
|
486
|
+
color: var(--vscode-debugView-stateLabelForeground);
|
|
487
|
+
background: var(--vscode-debugView-stateLabelBackground);
|
|
488
|
+
border-radius: 2px;
|
|
489
|
+
}
|
|
490
|
+
.scm-history-view .scm-provider .actions {
|
|
491
|
+
display: flex;
|
|
492
|
+
flex-grow: 1;
|
|
493
|
+
}
|
|
494
|
+
.scm-history-view .history-item-load-more {
|
|
495
|
+
display: flex;
|
|
496
|
+
height: 22px;
|
|
497
|
+
}
|
|
498
|
+
.scm-history-view .history-item-load-more .graph-placeholder {
|
|
499
|
+
mask-image: linear-gradient(black, transparent);
|
|
500
|
+
}
|
|
501
|
+
.scm-history-view .history-item-load-more .history-item-placeholder {
|
|
502
|
+
flex-grow: 1;
|
|
503
|
+
}
|
|
504
|
+
.scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label {
|
|
505
|
+
display: flex;
|
|
506
|
+
align-items: center;
|
|
507
|
+
justify-content: center;
|
|
508
|
+
color: var(--vscode-textLink-foreground)
|
|
509
|
+
}
|
|
510
|
+
.scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label .codicon {
|
|
511
|
+
font-size: 12px;
|
|
512
|
+
color: var(--vscode-textLink-foreground)
|
|
513
|
+
}
|
|
514
|
+
.scm-history-view .history-item-load-more .history-item-placeholder.shimmer {
|
|
515
|
+
padding: 2px 0;
|
|
516
|
+
}
|
|
517
|
+
.scm-history-view .history-item-load-more .history-item-placeholder.shimmer .monaco-icon-label-container {
|
|
518
|
+
height: 18px;
|
|
519
|
+
background: var(--vscode-scmGraph-historyItemHoverDefaultLabelBackground);
|
|
520
|
+
border-radius: 2px;
|
|
521
|
+
opacity: 0.5;
|
|
522
|
+
}
|
|
523
|
+
.monaco-workbench .part.statusbar > .items-container > .statusbar-item .codicon.codicon-repo {
|
|
524
|
+
padding-top: 1px;
|
|
525
|
+
}
|
|
@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
|
|
|
3
3
|
import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
|
|
4
4
|
import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
5
5
|
import { DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
6
|
-
import './media/scm.css
|
|
6
|
+
import './media/scm.css';
|
|
7
7
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
8
8
|
import { getActionBarActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
|
|
9
9
|
import { MenuId, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
|
|
@@ -231,7 +231,7 @@ SCMMenus = ( __decorate([
|
|
|
231
231
|
( __param(1, IInstantiationService))
|
|
232
232
|
], SCMMenus));
|
|
233
233
|
MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
|
|
234
|
-
title: ( localize(
|
|
234
|
+
title: ( localize(8975, "Share")),
|
|
235
235
|
submenu: MenuId.SCMResourceContextShare,
|
|
236
236
|
group: '45_share',
|
|
237
237
|
order: 3,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
3
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
4
|
-
import './media/dirtydiffDecorator.css
|
|
4
|
+
import './media/dirtydiffDecorator.css';
|
|
5
5
|
import { Disposable, DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
6
6
|
import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
7
7
|
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
@@ -11,7 +11,7 @@ import { isCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/brow
|
|
|
11
11
|
import { OverviewRulerLane, MinimapPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
|
|
12
12
|
import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
|
|
13
13
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
14
|
-
import { minimapGutterAddedBackground, overviewRulerAddedForeground, minimapGutterModifiedBackground, overviewRulerModifiedForeground, minimapGutterDeletedBackground, overviewRulerDeletedForeground, getChangeType, ChangeType } from '@codingame/monaco-vscode-
|
|
14
|
+
import { minimapGutterAddedBackground, overviewRulerAddedForeground, minimapGutterModifiedBackground, overviewRulerModifiedForeground, minimapGutterDeletedBackground, overviewRulerDeletedForeground, getChangeType, ChangeType } from '@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
|
|
15
15
|
import { IQuickDiffModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service';
|
|
16
16
|
import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
|
|
17
17
|
import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
|
|
@@ -56,7 +56,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
|
|
|
56
56
|
const gutter = decorations === 'all' || decorations === 'gutter';
|
|
57
57
|
const overview = decorations === 'all' || decorations === 'overview';
|
|
58
58
|
const minimap = decorations === 'all' || decorations === 'minimap';
|
|
59
|
-
const diffAdded = ( localize(
|
|
59
|
+
const diffAdded = ( localize(8976, 'Added lines'));
|
|
60
60
|
this.addedOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-added', diffAdded, {
|
|
61
61
|
gutter,
|
|
62
62
|
overview: { active: overview, color: overviewRulerAddedForeground },
|
|
@@ -69,7 +69,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
|
|
|
69
69
|
minimap: { active: minimap, color: minimapGutterAddedBackground },
|
|
70
70
|
isWholeLine: true
|
|
71
71
|
});
|
|
72
|
-
const diffModified = ( localize(
|
|
72
|
+
const diffModified = ( localize(8977, 'Changed lines'));
|
|
73
73
|
this.modifiedOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-modified', diffModified, {
|
|
74
74
|
gutter,
|
|
75
75
|
overview: { active: overview, color: overviewRulerModifiedForeground },
|
|
@@ -82,7 +82,7 @@ let QuickDiffDecorator = QuickDiffDecorator_1 = class QuickDiffDecorator extends
|
|
|
82
82
|
minimap: { active: minimap, color: minimapGutterModifiedBackground },
|
|
83
83
|
isWholeLine: true
|
|
84
84
|
});
|
|
85
|
-
this.deletedOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-deleted', ( localize(
|
|
85
|
+
this.deletedOptions = QuickDiffDecorator_1.createDecoration('dirty-diff-deleted', ( localize(8978, 'Removed lines')), {
|
|
86
86
|
gutter,
|
|
87
87
|
overview: { active: overview, color: overviewRulerDeletedForeground },
|
|
88
88
|
minimap: { active: minimap, color: minimapGutterDeletedBackground },
|
|
@@ -162,12 +162,12 @@ let QuickDiffWorkbenchController = class QuickDiffWorkbenchController extends Di
|
|
|
162
162
|
this.quickDiffModelService = quickDiffModelService;
|
|
163
163
|
this.uriIdentityService = uriIdentityService;
|
|
164
164
|
this.enabled = false;
|
|
165
|
-
this.activeEditor = observableFromEvent(this, this.editorService.onDidActiveEditorChange, () => this.editorService.activeEditor);
|
|
166
165
|
this.decorators = ( new ResourceMap());
|
|
167
166
|
this.viewState = { width: 3, visibility: 'always' };
|
|
168
167
|
this.transientDisposables = this._register(( new DisposableStore()));
|
|
169
168
|
this.stylesheet = createStyleSheet(undefined, undefined, this._store);
|
|
170
169
|
this.quickDiffDecorationCount = quickDiffDecorationCount.bindTo(contextKeyService);
|
|
170
|
+
this.activeEditor = observableFromEvent(this, this.editorService.onDidActiveEditorChange, () => this.editorService.activeEditor);
|
|
171
171
|
const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
|
|
172
172
|
this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
|
|
173
173
|
this.onDidChangeConfiguration();
|
|
@@ -8,7 +8,7 @@ import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/plat
|
|
|
8
8
|
import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
|
|
9
9
|
import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
|
|
10
10
|
import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
|
|
11
|
-
import { QuickDiff, QuickDiffChange, QuickDiffResult } from "@codingame/monaco-vscode-
|
|
11
|
+
import { QuickDiff, QuickDiffChange, QuickDiffResult } from "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff";
|
|
12
12
|
import { IQuickDiffService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service";
|
|
13
13
|
import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
|
|
14
14
|
import { ISplice } from "@codingame/monaco-vscode-api/vscode/vs/base/common/sequence";
|
|
@@ -9,7 +9,7 @@ import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/edi
|
|
|
9
9
|
import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
|
|
10
10
|
import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
|
|
11
11
|
import { shouldSynchronizeModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
|
|
12
|
-
import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-
|
|
12
|
+
import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
|
|
13
13
|
import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
|
|
14
14
|
import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
|
|
15
15
|
import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
|