@codingame/monaco-vscode-scm-service-override 20.1.1 → 20.2.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.
Files changed (5) hide show
  1. package/package.json +13 -13
  2. package/vscode/src/vs/workbench/contrib/scm/browser/media/dirtydiffDecorator.css +40 -0
  3. package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css +136 -0
  4. package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.d.ts +3 -0
  5. package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.d.ts +4 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-scm-service-override",
3
- "version": "20.1.1",
3
+ "version": "20.2.0",
4
4
  "private": false,
5
5
  "description": "VSCode public API plugged on the monaco editor - scm service-override",
6
6
  "keywords": [],
@@ -15,18 +15,18 @@
15
15
  },
16
16
  "type": "module",
17
17
  "dependencies": {
18
- "@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "20.1.1",
19
- "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "20.1.1",
20
- "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.1.1",
21
- "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.1.1",
22
- "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.1.1",
23
- "@codingame/monaco-vscode-api": "20.1.1",
24
- "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common": "20.1.1",
25
- "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "20.1.1",
26
- "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "20.1.1",
27
- "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.1.1",
28
- "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "20.1.1",
29
- "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "20.1.1"
18
+ "@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common": "20.2.0",
19
+ "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "20.2.0",
20
+ "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.2.0",
21
+ "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.2.0",
22
+ "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.2.0",
23
+ "@codingame/monaco-vscode-api": "20.2.0",
24
+ "@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common": "20.2.0",
25
+ "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "20.2.0",
26
+ "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "20.2.0",
27
+ "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.2.0",
28
+ "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "20.2.0",
29
+ "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "20.2.0"
30
30
  },
31
31
  "main": "index.js",
32
32
  "module": "index.js",
package/vscode/src/vs/workbench/contrib/scm/browser/media/dirtydiffDecorator.css CHANGED
@@ -1,7 +1,13 @@
1
+ /*---------------------------------------------------------------------------------------------
2
+ * Copyright (c) Microsoft Corporation. All rights reserved.
3
+ * Licensed under the MIT License. See License.txt in the project root for license information.
4
+ *--------------------------------------------------------------------------------------------*/
5
+
1
6
  .monaco-editor .dirty-diff-glyph {
2
7
  margin-left: 5px;
3
8
  z-index: 5;
4
9
  }
10
+
5
11
  .monaco-editor .dirty-diff-glyph:before {
6
12
  position: absolute;
7
13
  content: '';
@@ -9,80 +15,104 @@
9
15
  width: 0;
10
16
  left: -2px;
11
17
  }
18
+
12
19
  .monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-glyph:before {
13
20
  transition: width 80ms linear, left 80ms linear, transform 80ms linear;
14
21
  }
22
+
23
+ /* Hide glyph decorations when inside the inline diff editor */
15
24
  .monaco-editor.modified-in-monaco-diff-editor .margin-view-overlays > div > .dirty-diff-glyph {
16
25
  display: none;
17
26
  }
27
+
18
28
  .monaco-editor .dirty-diff-added:not(.pattern) {
19
29
  border-left-style: solid;
20
30
  }
31
+
21
32
  .monaco-editor .dirty-diff-added.primary {
22
33
  border-left-color: var(--vscode-editorGutter-addedBackground);
23
34
  }
35
+
24
36
  .monaco-editor .dirty-diff-added.primary:before {
25
37
  background: var(--vscode-editorGutter-addedBackground);
26
38
  }
39
+
27
40
  .monaco-editor .dirty-diff-added.secondary {
28
41
  border-left-color: var(--vscode-editorGutter-addedSecondaryBackground);
29
42
  }
43
+
30
44
  .monaco-editor .dirty-diff-added.secondary:before {
31
45
  background: var(--vscode-editorGutter-addedSecondaryBackground);
32
46
  }
47
+
33
48
  .monaco-editor .dirty-diff-added.pattern {
34
49
  background-repeat: repeat-y;
35
50
  }
51
+
36
52
  .monaco-editor .dirty-diff-added.pattern:before {
37
53
  transform: translateX(3px);
38
54
  }
55
+
39
56
  .monaco-editor .dirty-diff-added.pattern.primary,
40
57
  .monaco-editor .dirty-diff-added.pattern.primary:before {
41
58
  background-image: linear-gradient(-45deg, var(--vscode-editorGutter-addedBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-addedBackground) 50%, var(--vscode-editorGutter-addedBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
42
59
  }
60
+
43
61
  .monaco-editor .dirty-diff-added.pattern.secondary,
44
62
  .monaco-editor .dirty-diff-added.pattern.secondary:before {
45
63
  background-image: linear-gradient(45deg, var(--vscode-editorGutter-addedSecondaryBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-addedSecondaryBackground) 50%, var(--vscode-editorGutter-addedSecondaryBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
46
64
  }
65
+
47
66
  .monaco-editor .dirty-diff-modified:not(.pattern) {
48
67
  border-left-style: solid;
49
68
  }
69
+
50
70
  .monaco-editor .dirty-diff-modified.primary {
51
71
  border-left-color: var(--vscode-editorGutter-modifiedBackground);
52
72
  }
73
+
53
74
  .monaco-editor .dirty-diff-modified.primary:before {
54
75
  background: var(--vscode-editorGutter-modifiedBackground);
55
76
  }
77
+
56
78
  .monaco-editor .dirty-diff-modified.secondary {
57
79
  border-left-color: var(--vscode-editorGutter-modifiedSecondaryBackground);
58
80
  }
81
+
59
82
  .monaco-editor .dirty-diff-modified.secondary:before {
60
83
  background: var(--vscode-editorGutter-modifiedSecondaryBackground);
61
84
  }
85
+
62
86
  .monaco-editor .dirty-diff-modified.pattern {
63
87
  background-repeat: repeat-y;
64
88
  }
89
+
65
90
  .monaco-editor .dirty-diff-modified.pattern:before {
66
91
  transform: translateX(3px);
67
92
  }
93
+
68
94
  .monaco-editor .dirty-diff-modified.pattern.primary,
69
95
  .monaco-editor .dirty-diff-modified.pattern.primary:before {
70
96
  background-image: linear-gradient(-45deg, var(--vscode-editorGutter-modifiedBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-modifiedBackground) 50%, var(--vscode-editorGutter-modifiedBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
71
97
  }
98
+
72
99
  .monaco-editor .dirty-diff-modified.pattern.secondary,
73
100
  .monaco-editor .dirty-diff-modified.pattern.secondary:before {
74
101
  background-image: linear-gradient(45deg, var(--vscode-editorGutter-modifiedSecondaryBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-modifiedSecondaryBackground) 50%, var(--vscode-editorGutter-modifiedSecondaryBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
75
102
  }
103
+
76
104
  .monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-added,
77
105
  .monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-modified,
78
106
  .monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-deleted {
79
107
  transition: opacity 0.5s;
80
108
  }
109
+
81
110
  .monaco-editor .margin:hover .dirty-diff-added,
82
111
  .monaco-editor .margin:hover .dirty-diff-modified,
83
112
  .monaco-editor .margin:hover .dirty-diff-deleted {
84
113
  opacity: 1;
85
114
  }
115
+
86
116
  .monaco-editor .dirty-diff-deleted:after {
87
117
  content: '';
88
118
  position: absolute;
@@ -95,36 +125,46 @@
95
125
  border-bottom: 4px solid transparent;
96
126
  pointer-events: none;
97
127
  }
128
+
98
129
  .monaco-editor .dirty-diff-deleted.primary:after {
99
130
  border-left: 4px solid var(--vscode-editorGutter-deletedBackground);
100
131
  }
132
+
101
133
  .monaco-editor .dirty-diff-deleted.secondary:after {
102
134
  border-left: 4px solid var(--vscode-editorGutter-deletedSecondaryBackground);
103
135
  }
136
+
104
137
  .monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-deleted:after {
105
138
  transition: border-top-width 80ms linear, border-bottom-width 80ms linear, bottom 80ms linear, opacity 0.5s;
106
139
  }
140
+
107
141
  .monaco-editor .dirty-diff-deleted:before {
108
142
  background: var(--vscode-editorGutter-deletedBackground);
109
143
  margin-left: 3px;
110
144
  height: 0;
111
145
  bottom: 0;
112
146
  }
147
+
113
148
  .monaco-editor .dirty-diff-deleted.primary:before {
114
149
  background: var(--vscode-editorGutter-deletedBackground);
115
150
  }
151
+
116
152
  .monaco-editor .dirty-diff-deleted.secondary:before {
117
153
  background: var(--vscode-editorGutter-deletedSecondaryBackground);
118
154
  }
155
+
119
156
  .monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-deleted:before {
120
157
  transition: height 80ms linear;
121
158
  }
159
+
122
160
  .dirty-diff .peekview-title .dropdown {
123
161
  margin-right: 10px;
124
162
  }
163
+
125
164
  .dirty-diff .peekview-title .dropdown.select-container {
126
165
  cursor: default;
127
166
  }
167
+
128
168
  .dirty-diff .peekview-title .dropdown .monaco-select-box {
129
169
  cursor: pointer;
130
170
  min-width: 100px;
package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css CHANGED
@@ -1,7 +1,13 @@
1
+ /*---------------------------------------------------------------------------------------------
2
+ * Copyright (c) Microsoft Corporation. All rights reserved.
3
+ * Licensed under the MIT License. See License.txt in the project root for license information.
4
+ *--------------------------------------------------------------------------------------------*/
5
+
1
6
  .scm-view {
2
7
  height: 100%;
3
8
  position: relative;
4
9
  }
10
+
5
11
  .scm-overflow-widgets-container {
6
12
  position: absolute;
7
13
  top: 0;
@@ -11,17 +17,21 @@
11
17
  overflow: visible;
12
18
  z-index: 5000;
13
19
  }
20
+
14
21
  .scm-view .monaco-tl-contents > div {
15
22
  padding-right: 12px;
16
23
  overflow: hidden;
17
24
  }
25
+
18
26
  .scm-view .count {
19
27
  display: flex;
20
28
  margin-left: 6px;
21
29
  }
30
+
22
31
  .scm-view .count.hidden {
23
32
  display: none;
24
33
  }
34
+
25
35
  .scm-view .scm-provider {
26
36
  display: flex;
27
37
  flex-direction: column;
@@ -29,33 +39,45 @@
29
39
  align-items: center;
30
40
  flex-flow: nowrap;
31
41
  }
42
+
32
43
  .scm-view.hide-provider-counts .scm-provider > .count,
33
44
  .scm-view.auto-provider-counts .scm-provider > .count[data-count="0"] {
34
45
  display: none;
35
46
  }
47
+
36
48
  .scm-view .scm-provider > .monaco-icon-label {
37
49
  flex: 1;
38
50
  }
51
+
39
52
  .scm-view .scm-provider .monaco-highlighted-label {
40
53
  display: flex;
41
54
  align-items: center;
42
55
  font-weight: bold;
43
56
  }
57
+
44
58
  .scm-view .scm-provider .monaco-highlighted-label .codicon {
45
59
  font-size: 14px;
46
60
  }
61
+
47
62
  .scm-view .scm-provider > .actions {
48
63
  overflow: hidden;
49
64
  justify-content: flex-end;
50
65
  }
66
+
67
+ /**
68
+ * The following rules are very specific because of inline drop down menus
69
+ * https://github.com/microsoft/vscode/issues/101410
70
+ */
51
71
  .scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item {
52
72
  padding-left: 4px;
53
73
  display: flex;
54
74
  align-items: center;
55
75
  }
76
+
56
77
  .scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item:nth-child(1) {
57
78
  min-width: 20px;
58
79
  }
80
+
59
81
  .scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label,
60
82
  .scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .monaco-dropdown > .dropdown-label > .action-label {
61
83
  display: flex;
@@ -63,25 +85,32 @@
63
85
  line-height: 16px;
64
86
  overflow: hidden;
65
87
  }
88
+
66
89
  .scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item > .action-label > .codicon {
67
90
  font-size: 12px;
68
91
  justify-content: center;
69
92
  }
93
+
70
94
  .scm-view .scm-provider > .actions > .monaco-toolbar > .monaco-action-bar > .actions-container > .action-item:last-of-type {
71
95
  padding-right: 0;
72
96
  }
97
+
73
98
  .scm-view .scm-provider > .body {
74
99
  flex-grow: 1;
75
100
  }
101
+
76
102
  .scm-view .scm-provider > .status > .monaco-action-bar > .actions-container {
77
103
  border-color: var(--vscode-sideBar-border);
78
104
  }
105
+
79
106
  .scm-view .monaco-list-row {
80
107
  line-height: 22px;
81
108
  }
109
+
82
110
  .scm-view .monaco-list-row .monaco-icon-label-container {
83
111
  height: 22px;
84
112
  }
113
+
85
114
  .scm-view .monaco-list-row .history,
86
115
  .scm-view .monaco-list-row .history-item-group,
87
116
  .scm-view .monaco-list-row .resource-group {
@@ -89,61 +118,75 @@
89
118
  height: 100%;
90
119
  align-items: center;
91
120
  }
121
+
92
122
  .scm-view .monaco-list-row .history-item-group .monaco-icon-label,
93
123
  .scm-view .monaco-list-row .history-item .monaco-icon-label {
94
124
  flex-grow: 1;
95
125
  align-items: center;
96
126
  }
127
+
97
128
  .scm-view .monaco-list-row .history-item {
98
129
  display: flex;
99
130
  align-items: center;
100
131
  }
132
+
101
133
  .scm-view .monaco-list-row .monaco-tl-twistie:not(.collapsed) + .monaco-tl-contents > .history-item > .graph-container > svg > path:last-of-type {
102
134
  stroke-width: 3px;
103
135
  }
136
+
104
137
  .scm-view .monaco-list-row .history-item > .graph-container {
105
138
  display: flex;
106
139
  flex-shrink: 0;
107
140
  height: 22px;
108
141
  }
142
+
109
143
  .scm-view .monaco-list-row .history-item > .graph-container.current > .graph > circle:last-child {
110
144
  fill: var(--vscode-sideBar-background);
111
145
  }
146
+
112
147
  .scm-view .monaco-list-row:hover .history-item > .graph-container.current > .graph > circle:last-child {
113
148
  fill: var(--vscode-list-hoverBackground);
114
149
  }
150
+
115
151
  .scm-view .monaco-list-row .history-item > .graph-container > .graph > circle {
116
152
  stroke: var(--vscode-sideBar-background);
117
153
  }
154
+
118
155
  .scm-view .monaco-list-row:hover .history-item > .graph-container > .graph > circle:first-of-type {
119
156
  stroke: transparent;
120
157
  }
158
+
121
159
  .scm-view .monaco-list-row .history-item > .label-container {
122
160
  display: flex;
123
161
  flex-shrink: 0;
124
162
  margin-left: 4px;
125
163
  gap: 4px;
126
164
  }
165
+
127
166
  .scm-view .monaco-list-row .history-item > .label-container > .label {
128
167
  display: flex;
129
168
  align-items: center;
130
169
  border-radius: 10px;
131
170
  line-height: 18px;
132
171
  }
172
+
133
173
  .scm-view .monaco-list-row .history-item > .label-container > .label > .count {
134
174
  font-size: 12px;
135
175
  margin-left: 0;
136
176
  padding-left: 4px;
137
177
  }
178
+
138
179
  .scm-view .monaco-list-row .history-item > .label-container > .label > .codicon {
139
180
  font-size: 14px;
140
181
  color: inherit !important;
141
182
  padding: 2px;
142
183
  }
184
+
143
185
  .scm-view .monaco-list-row .history-item > .label-container > .label > .codicon.codicon-git-branch {
144
186
  font-size: 12px;
145
187
  padding: 3px;
146
188
  }
189
+
147
190
  .scm-view .monaco-list-row .history-item > .label-container > .label > .description {
148
191
  font-size: 12px;
149
192
  padding-right: 4px;
@@ -151,45 +194,56 @@
151
194
  text-overflow: ellipsis;
152
195
  max-width: 100px;
153
196
  }
197
+
154
198
  .scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container {
155
199
  display: flex;
156
200
  padding-right: 4px;
157
201
  }
202
+
158
203
  .scm-view .monaco-list-row .history-item .monaco-icon-label .avatar {
159
204
  width: 14px;
160
205
  height: 14px;
161
206
  border-radius: 14px;
162
207
  }
208
+
163
209
  .scm-view .monaco-list-row .history-item .monaco-icon-label.history-item-current .label-name {
164
210
  font-weight: 600;
165
211
  }
212
+
166
213
  .scm-view .monaco-list-row .history-item .monaco-icon-label.history-item-current .label-description {
167
214
  font-weight: 500;
168
215
  }
216
+
169
217
  .scm-view .monaco-list-row .history-item > .actions {
170
218
  margin-left: 4px;
171
219
  }
220
+
172
221
  .scm-view .monaco-list-row .history > .name,
173
222
  .scm-view .monaco-list-row .resource-group > .name {
174
223
  flex: 1;
175
224
  overflow: hidden;
176
225
  text-overflow: ellipsis;
177
226
  }
227
+
178
228
  .scm-view .monaco-list-row .resource {
179
229
  display: flex;
180
230
  height: 100%;
181
231
  }
232
+
182
233
  .scm-view .monaco-list-row .resource.faded {
183
234
  opacity: 0.7;
184
235
  }
236
+
185
237
  .scm-view .monaco-list-row .resource > .name {
186
238
  flex: 1;
187
239
  overflow: hidden;
188
240
  }
241
+
189
242
  .scm-view .monaco-list-row .resource > .name > .monaco-icon-label::after,
190
243
  .scm-view .monaco-list-row .history-item-change > .label-container > .monaco-icon-label::after {
191
244
  margin-right: 3px;
192
245
  }
246
+
193
247
  .scm-view .monaco-list-row .resource > .decoration-icon {
194
248
  width: 16px;
195
249
  height: 100%;
@@ -197,13 +251,16 @@
197
251
  background-position: 50% 50%;
198
252
  margin-left: 5px;
199
253
  }
254
+
200
255
  .scm-view .monaco-list-row .resource > .decoration-icon.codicon {
201
256
  margin-right: 0;
202
257
  margin-top: 3px;
203
258
  }
259
+
204
260
  .scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions {
205
261
  flex-grow: 100;
206
262
  }
263
+
207
264
  .scm-view .monaco-list .monaco-list-row .resource-group > .actions,
208
265
  .scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions,
209
266
  .scm-view .monaco-list .monaco-list-row .history-item > .actions,
@@ -211,6 +268,7 @@
211
268
  display: none;
212
269
  max-width: fit-content;
213
270
  }
271
+
214
272
  .scm-view .monaco-list .monaco-list-row:hover .resource-group > .actions,
215
273
  .scm-view .monaco-list .monaco-list-row.focused .resource-group > .actions,
216
274
  .scm-view .monaco-list .monaco-list-row:hover .resource > .name > .monaco-icon-label > .actions,
@@ -222,15 +280,18 @@
222
280
  .scm-view .monaco-list .monaco-list-row.focused .history-item-change > .label-container > .monaco-icon-label > .actions {
223
281
  display: block;
224
282
  }
283
+
225
284
  .scm-view .monaco-list .monaco-list-row.force-no-hover,
226
285
  .scm-view .monaco-list .monaco-list-row:hover.force-no-hover,
227
286
  .scm-view .monaco-list .monaco-list-row.focused.force-no-hover,
228
287
  .scm-view .monaco-list .monaco-list-row.selected.force-no-hover {
229
288
  background: transparent !important;
230
289
  }
290
+
231
291
  .scm-view .monaco-list .monaco-list-row.cursor-default {
232
292
  cursor: default;
233
293
  }
294
+
234
295
  .scm-view.show-actions .scm-provider > .actions,
235
296
  .scm-view.show-actions > .monaco-list .monaco-list-row .scm-input > .scm-editor > .actions,
236
297
  .scm-view.show-actions > .monaco-list .monaco-list-row .resource-group > .actions,
@@ -238,30 +299,38 @@
238
299
  .scm-view.show-actions > .monaco-list .monaco-list-row .history-item > .actions {
239
300
  display: block;
240
301
  }
302
+
241
303
  .scm-view .monaco-list-row .actions .action-label {
242
304
  padding: 2px;
243
305
  }
306
+
244
307
  .scm-view .scm-input {
245
308
  height: 100%;
246
309
  display: flex;
247
310
  align-items: center;
248
311
  padding-left: 11px;
249
312
  }
313
+
250
314
  .scm-view .scm-input .scm-editor .scm-editor-toolbar {
251
315
  padding: 1px 3px 1px 1px;
252
316
  }
317
+
253
318
  .scm-view .scm-input .scm-editor .scm-editor-toolbar.hidden {
254
319
  display: none;
255
320
  }
321
+
256
322
  .scm-view .scm-input .scm-editor .scm-editor-toolbar.scroll-decoration {
257
323
  box-shadow: var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset;
258
324
  }
325
+
259
326
  .scm-view .scm-input .scm-editor .scm-editor-toolbar .action-label.codicon.codicon-debug-stop {
260
327
  color: var(--vscode-icon-foreground) !important;
261
328
  }
329
+
262
330
  .scm-view .scm-editor-container .monaco-editor {
263
331
  border-radius: 2px;
264
332
  }
333
+
265
334
  .scm-view .scm-editor {
266
335
  box-sizing: border-box;
267
336
  width: 100%;
@@ -272,61 +341,76 @@
272
341
  background-color: var(--vscode-input-background);
273
342
  border-radius: 2px;
274
343
  }
344
+
275
345
  .scm-view .button-container {
276
346
  display: flex;
277
347
  height: 100%;
278
348
  padding-left: 11px;
279
349
  align-items: center;
280
350
  }
351
+
281
352
  .scm-view .button-container .codicon.codicon-cloud-upload,
282
353
  .scm-view .button-container .codicon.codicon-sync {
283
354
  margin: 0 4px 0 0;
284
355
  }
356
+
285
357
  .scm-view .button-container .codicon.codicon-arrow-up,
286
358
  .scm-view .button-container .codicon.codicon-arrow-down {
287
359
  font-size: small !important;
288
360
  margin: 0 4px 0 0;
289
361
  }
362
+
290
363
  .scm-view .button-container > .monaco-button-dropdown {
291
364
  flex-grow: 1;
292
365
  overflow: hidden;
293
366
  }
367
+
294
368
  .scm-view .button-container > .monaco-button-dropdown > .monaco-dropdown-button {
295
369
  display:flex;
296
370
  align-items: center;
297
371
  padding: 0 4px;
298
372
  }
373
+
374
+
299
375
  .scm-view .button-container > .monaco-button-dropdown > .monaco-button.monaco-text-button {
300
376
  min-width: 0;
301
377
  }
378
+
302
379
  .scm-view .button-container > .monaco-button-dropdown > .monaco-button.monaco-text-button > span:not(.codicon) {
303
380
  overflow: hidden;
304
381
  text-overflow: ellipsis;
305
382
  white-space: nowrap;
306
383
  }
384
+
307
385
  .scm-view .scm-editor.hidden {
308
386
  display: none;
309
387
  }
388
+
310
389
  .monaco-workbench .part.panel .scm-view .scm-editor-container {
311
390
  outline: 1px solid var(--vscode-panelInput-border);
312
391
  }
392
+
313
393
  .scm-view .scm-editor.synthetic-focus,
314
394
  .monaco-workbench .part.panel .scm-view .scm-editor.synthetic-focus {
315
395
  outline: 1px solid var(--vscode-focusBorder);
316
396
  outline-offset: -1px;
317
397
  }
398
+
318
399
  .scm-view .scm-editor.validation-info {
319
400
  outline: 1px solid var(--vscode-inputValidation-infoBorder) !important;
320
401
  outline-offset: -1px;
321
402
  }
403
+
322
404
  .scm-view .scm-editor.validation-warning {
323
405
  outline: 1px solid var(--vscode-inputValidation-warningBorder) !important;
324
406
  outline-offset: -1px;
325
407
  }
408
+
326
409
  .scm-view .scm-editor.validation-error {
327
410
  outline: 1px solid var(--vscode-inputValidation-errorBorder) !important;
328
411
  outline-offset: -1px;
329
412
  }
413
+
330
414
  .scm-editor-validation-container {
331
415
  display: flex;
332
416
  box-sizing: border-box;
@@ -337,21 +421,25 @@
337
421
  border-bottom-right-radius: 2px;
338
422
  padding: 2px;
339
423
  }
424
+
340
425
  .scm-editor-validation-container.validation-info {
341
426
  background-color: var(--vscode-inputValidation-infoBackground);
342
427
  border-color: var(--vscode-inputValidation-infoBorder);
343
428
  color: var(--vscode-inputValidation-infoForeground);
344
429
  }
430
+
345
431
  .scm-editor-validation-container.validation-warning {
346
432
  background-color: var(--vscode-inputValidation-warningBackground);
347
433
  border-color: var(--vscode-inputValidation-warningBorder);
348
434
  color: var(--vscode-inputValidation-warningForeground);
349
435
  }
436
+
350
437
  .scm-editor-validation-container.validation-error {
351
438
  background-color: var(--vscode-inputValidation-errorBackground);
352
439
  border-color: var(--vscode-inputValidation-errorBorder);
353
440
  color: var(--vscode-inputValidation-errorForeground);
354
441
  }
442
+
355
443
  .scm-editor-validation {
356
444
  box-sizing: border-box;
357
445
  font-size: 0.9em;
@@ -360,23 +448,28 @@
360
448
  border-style: none;
361
449
  flex: auto;
362
450
  }
451
+
363
452
  .scm-editor-validation p {
364
453
  margin: 0;
365
454
  padding: 0;
366
455
  }
456
+
367
457
  .scm-editor-validation a {
368
458
  color: var(--vscode-textLink-foreground);
369
459
  -webkit-user-select: none;
370
460
  user-select: none;
371
461
  }
462
+
372
463
  .scm-editor-validation a:active,
373
464
  .scm-editor-validation a:hover {
374
465
  color: var(--vscode-textLink-activeForeground);
375
466
  }
467
+
376
468
  .scm-editor-validation-actions {
377
469
  align-self: start;
378
470
  margin-top: 1px;
379
471
  }
472
+
380
473
  .scm-view .scm-editor-container .monaco-editor-background,
381
474
  .scm-view .scm-editor-container .monaco-editor,
382
475
  .scm-view .scm-editor-container .monaco-editor .margin,
@@ -386,60 +479,82 @@
386
479
  color: inherit;
387
480
  background-color: var(--vscode-input-background);
388
481
  }
482
+
389
483
  .scm-view .scm-editor-container .mtk1 {
390
484
  color: var(--vscode-input-foreground);
391
485
  }
486
+
392
487
  .scm-view .scm-editor-container .placeholder-text.mtk1 {
393
488
  color: var(--vscode-input-placeholderForeground);
394
489
  }
490
+
491
+ /* Repositories */
492
+
395
493
  .scm-view.scm-repositories-view .monaco-highlighted-label {
396
494
  font-weight: normal;
397
495
  }
496
+
497
+ /* History item hover */
498
+
398
499
  .monaco-hover.history-item-hover p:first-child {
399
500
  margin-top: 4px;
400
501
  }
502
+
401
503
  .monaco-hover.history-item-hover p:last-child {
402
504
  margin-bottom: 2px !important;
403
505
  }
506
+
404
507
  .monaco-hover.history-item-hover p:last-child span:not(.codicon) {
405
508
  padding: 2px 0;
406
509
  }
510
+
407
511
  .monaco-hover.history-item-hover hr {
408
512
  margin-top: 4px;
409
513
  margin-bottom: 4px;
410
514
  }
515
+
411
516
  .monaco-hover.history-item-hover hr + p {
412
517
  margin: 4px 0;
413
518
  }
519
+
414
520
  .monaco-hover.history-item-hover span:not(.codicon) {
415
521
  margin-bottom: 0 !important;
416
522
  }
523
+
417
524
  .monaco-hover.history-item-hover p > span > span.codicon.codicon-git-branch {
418
525
  font-size: 12px;
419
526
  margin-bottom: 2px !important;
420
527
  }
528
+
421
529
  .monaco-hover.history-item-hover p > span > span.codicon.codicon-tag,
422
530
  .monaco-hover.history-item-hover p > span > span.codicon.codicon-target {
423
531
  font-size: 14px;
424
532
  margin-bottom: 2px !important;
425
533
  }
534
+
426
535
  .monaco-hover.history-item-hover p > span > span.codicon.codicon-cloud {
427
536
  font-size: 14px;
428
537
  margin-bottom: 1px !important;
429
538
  }
539
+
430
540
  .monaco-hover.history-item-hover .hover-row.status-bar .action {
431
541
  display: flex;
432
542
  align-items: center;
433
543
  }
544
+
434
545
  .monaco-hover.history-item-hover .hover-row.status-bar .action .codicon {
435
546
  color: inherit;
436
547
  font-size: 12px;
437
548
  }
549
+
550
+ /* Graph */
551
+
438
552
  .pane-header .scm-graph-view-badge-container {
439
553
  display: flex;
440
554
  align-items: center;
441
555
  min-width: fit-content;
442
556
  }
557
+
443
558
  .pane-header .scm-graph-view-badge-container > .scm-graph-view-badge.monaco-count-badge.long {
444
559
  background-color: var(--vscode-badge-background);
445
560
  color: var(--vscode-badge-foreground);
@@ -447,6 +562,7 @@
447
562
  margin: 0 6px;
448
563
  padding: 2px 4px;
449
564
  }
565
+
450
566
  .monaco-workbench .part.sidebar > .title > .title-actions .action-label.scm-graph-repository-picker,
451
567
  .monaco-workbench .part.sidebar > .title > .title-actions .action-label.scm-graph-history-item-picker,
452
568
  .monaco-workbench .part.auxiliarybar > .title > .title-actions .action-label.scm-graph-repository-picker,
@@ -455,6 +571,7 @@
455
571
  .monaco-workbench .part.panel > .title > .title-actions .action-label.scm-graph-history-item-picker {
456
572
  display: flex;
457
573
  }
574
+
458
575
  .monaco-toolbar .action-item > .action-label.scm-graph-repository-picker,
459
576
  .monaco-toolbar .action-item > .action-label.scm-graph-history-item-picker {
460
577
  color: var(--vscode-icon-foreground);
@@ -462,30 +579,37 @@
462
579
  font-weight: normal;
463
580
  line-height: 16px;
464
581
  }
582
+
465
583
  .monaco-toolbar .action-item.disabled > .action-label.scm-graph-repository-picker,
466
584
  .monaco-toolbar .action-item.disabled > .action-label.scm-graph-history-item-picker {
467
585
  color: var(--vscode-disabledForeground);
468
586
  }
587
+
469
588
  .monaco-toolbar .action-label.scm-graph-repository-picker .codicon,
470
589
  .monaco-toolbar .action-label.scm-graph-history-item-picker .codicon {
471
590
  font-size: 14px;
472
591
  color: inherit;
473
592
  }
593
+
474
594
  .monaco-toolbar .action-label.scm-graph-repository-picker > .name,
475
595
  .monaco-toolbar .action-label.scm-graph-history-item-picker > .name {
476
596
  max-width: 100px;
477
597
  overflow: hidden;
478
598
  text-overflow: ellipsis;
479
599
  }
600
+
480
601
  .scm-history-view .monaco-list-row > .monaco-tl-row > .monaco-tl-twistie.force-no-twistie {
481
602
  display: none !important;
482
603
  }
604
+
483
605
  .scm-history-view .scm-provider .label-name {
484
606
  font-weight: bold;
485
607
  }
608
+
486
609
  .scm-history-view .scm-provider .monaco-icon-label {
487
610
  align-items: center;
488
611
  }
612
+
489
613
  .scm-history-view .scm-provider .state-label.monaco-count-badge.long {
490
614
  display: flex;
491
615
  font-size: 0.8em;
@@ -494,49 +618,61 @@
494
618
  background: var(--vscode-debugView-stateLabelBackground);
495
619
  border-radius: 2px;
496
620
  }
621
+
497
622
  .scm-history-view .scm-provider .actions {
498
623
  display: flex;
499
624
  flex-grow: 1;
500
625
  }
626
+
501
627
  .scm-view .monaco-list-row .history-item-change {
502
628
  display: flex;
503
629
  align-items: center;
504
630
  }
631
+
505
632
  .scm-view .monaco-list-row .history-item-change > .graph-placeholder {
506
633
  position: absolute;
507
634
  height: 22px;
508
635
  }
636
+
509
637
  .scm-view .monaco-list-row .history-item-change > .label-container {
510
638
  display: flex;
511
639
  flex: 1;
512
640
  overflow: hidden;
513
641
  }
642
+
514
643
  .scm-view .monaco-list-row .history-item-change > .label-container > .monaco-icon-label {
515
644
  flex-grow: 1;
516
645
  }
646
+
517
647
  .scm-history-view .history-item-load-more {
518
648
  display: flex;
519
649
  height: 22px;
520
650
  }
651
+
521
652
  .scm-history-view .history-item-load-more .graph-placeholder {
522
653
  mask-image: linear-gradient(black, transparent);
523
654
  }
655
+
524
656
  .scm-history-view .history-item-load-more .history-item-placeholder {
525
657
  flex-grow: 1;
526
658
  }
659
+
527
660
  .scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label {
528
661
  display: flex;
529
662
  align-items: center;
530
663
  justify-content: center;
531
664
  color: var(--vscode-textLink-foreground)
532
665
  }
666
+
533
667
  .scm-history-view .history-item-load-more .history-item-placeholder .monaco-highlighted-label .codicon {
534
668
  font-size: 12px;
535
669
  color: var(--vscode-textLink-foreground)
536
670
  }
671
+
537
672
  .scm-history-view .history-item-load-more .history-item-placeholder.shimmer {
538
673
  padding: 2px 0;
539
674
  }
675
+
540
676
  .scm-history-view .history-item-load-more .history-item-placeholder.shimmer .monaco-icon-label-container {
541
677
  height: 18px;
542
678
  background: var(--vscode-scmGraph-historyItemHoverDefaultLabelBackground);
package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffModel.d.ts CHANGED
@@ -57,6 +57,9 @@ export declare class QuickDiffModel extends Disposable {
57
57
  get allChanges(): QuickDiffChange[];
58
58
  private _changes;
59
59
  get changes(): QuickDiffChange[];
60
+ /**
61
+ * Map of quick diff name to the index of the change in `this.changes`
62
+ */
60
63
  private _quickDiffChanges;
61
64
  get quickDiffChanges(): Map<string, number[]>;
62
65
  private readonly _repositoryDisposables;
package/vscode/src/vs/workbench/contrib/scm/browser/scmViewService.d.ts CHANGED
@@ -59,6 +59,10 @@ export declare class SCMViewService implements ISCMViewService {
59
59
  readonly activeRepository: IObservable<ISCMRepository | undefined>;
60
60
  private readonly _activeEditorObs;
61
61
  private readonly _activeEditorRepositoryObs;
62
+ /**
63
+ * The focused repository takes precedence over the active editor repository when the observable
64
+ * values are updated in the same transaction (or during the initial read of the observable value).
65
+ */
62
66
  private readonly _activeRepositoryObs;
63
67
  private readonly _activeRepositoryPinnedObs;
64
68
  private readonly _focusedRepositoryObs;