Skip to content

Commit 78831f0

Browse files
amungeramunger
authored
Merge branch 'main' into scrollableBorder
2 parents b380ef5 + a044bb1 commit 78831f0

File tree

89 files changed

+993
-548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+993
-548
lines changed

‎build/.moduleignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,11 @@ prebuild-install/**/*
147147
**/*.ts
148148
!typescript/**/*.d.ts
149149

150+
# Exclude TS files that aren't needed by TS extension
151+
typescript/lib/tsc.js
152+
typescript/lib/typescriptServices.js
153+
typescript/lib/tsserverlibrary.js
154+
150155
jschardet/index.js
151156
jschardet/src/**
152157
jschardet/dist/jschardet.js
@@ -167,5 +172,3 @@ xterm-addon-*/src/**
167172
xterm-addon-*/fixtures/**
168173
xterm-addon-*/out/**
169174
xterm-addon-*/out-test/**
170-
171-

‎extensions/.vscodeignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.74.0",
4-
"distro": "7153817c51ee07fd57e84a33afdaede63b3937f8",
4+
"distro": "540bfe34933334669527ef1900a9e112965fbdde",
55
"author": {
66
"name": "Microsoft Corporation"
77
},

‎src/vs/base/browser/ui/sash/sash.css

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
:root {
7-
--sash-size: 4px;
7+
--vscode-sash-size: 4px;
88
}
99

1010
.monaco-sash {
@@ -49,21 +49,21 @@
4949
.monaco-sash.vertical {
5050
cursor: ew-resize;
5151
top: 0;
52-
width: var(--sash-size);
52+
width: var(--vscode-sash-size);
5353
height: 100%;
5454
}
5555

5656
.monaco-sash.horizontal {
5757
cursor: ns-resize;
5858
left: 0;
5959
width: 100%;
60-
height: var(--sash-size);
60+
height: var(--vscode-sash-size);
6161
}
6262

6363
.monaco-sash:not(.disabled) > .orthogonal-drag-handle {
6464
content: " ";
65-
height: calc(var(--sash-size) * 2);
66-
width: calc(var(--sash-size) * 2);
65+
height: calc(var(--vscode-sash-size) * 2);
66+
width: calc(var(--vscode-sash-size) * 2);
6767
z-index: 100;
6868
display: block;
6969
cursor: all-scroll;
@@ -85,20 +85,20 @@
8585
}
8686

8787
.monaco-sash.vertical > .orthogonal-drag-handle.start {
88-
left: calc(var(--sash-size) * -0.5);
89-
top: calc(var(--sash-size) * -1);
88+
left: calc(var(--vscode-sash-size) * -0.5);
89+
top: calc(var(--vscode-sash-size) * -1);
9090
}
9191
.monaco-sash.vertical > .orthogonal-drag-handle.end {
92-
left: calc(var(--sash-size) * -0.5);
93-
bottom: calc(var(--sash-size) * -1);
92+
left: calc(var(--vscode-sash-size) * -0.5);
93+
bottom: calc(var(--vscode-sash-size) * -1);
9494
}
9595
.monaco-sash.horizontal > .orthogonal-drag-handle.start {
96-
top: calc(var(--sash-size) * -0.5);
97-
left: calc(var(--sash-size) * -1);
96+
top: calc(var(--vscode-sash-size) * -0.5);
97+
left: calc(var(--vscode-sash-size) * -1);
9898
}
9999
.monaco-sash.horizontal > .orthogonal-drag-handle.end {
100-
top: calc(var(--sash-size) * -0.5);
101-
right: calc(var(--sash-size) * -1);
100+
top: calc(var(--vscode-sash-size) * -0.5);
101+
right: calc(var(--vscode-sash-size) * -1);
102102
}
103103

104104
.monaco-sash:before {
@@ -117,13 +117,13 @@
117117
}
118118

119119
.monaco-sash.vertical:before {
120-
width: var(--sash-hover-size);
121-
left: calc(50% - (var(--sash-hover-size) / 2));
120+
width: var(--vscode-sash-hover-size);
121+
left: calc(50% - (var(--vscode-sash-hover-size) / 2));
122122
}
123123

124124
.monaco-sash.horizontal:before {
125-
height: var(--sash-hover-size);
126-
top: calc(50% - (var(--sash-hover-size) / 2));
125+
height: var(--vscode-sash-hover-size);
126+
top: calc(50% - (var(--vscode-sash-hover-size) / 2));
127127
}
128128

129129
.pointer-events-disabled {

‎src/vs/base/browser/ui/scrollbar/media/scrollbars.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
left: 0;
5353
height: 3px;
5454
width: 3px;
55+
}
56+
.monaco-scrollable-element > .shadow.top.left {
5557
box-shadow: var(--vscode-scrollbar-shadow) 6px 0 6px -6px inset;
5658
}
5759

‎src/vs/base/browser/ui/table/table.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
.monaco-table > .monaco-split-view2 .monaco-sash.vertical::before {
4747
content: "";
4848
position: absolute;
49-
left: calc(var(--sash-size) / 2);
49+
left: calc(var(--vscode-sash-size) / 2);
5050
width: 0;
5151
border-left: 1px solid transparent;
5252
}

‎src/vs/code/electron-browser/sharedProcess/contrib/extensions.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Disposable } from 'vs/base/common/lifecycle';
7-
import { DEFAULT_PROFILE_EXTENSIONS_MIGRATION_KEY, IExtensionGalleryService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
7+
import { IExtensionGalleryService, IGlobalExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
88
import { ExtensionStorageService, IExtensionStorageService } from 'vs/platform/extensionManagement/common/extensionStorage';
99
import { migrateUnsupportedExtensions } from 'vs/platform/extensionManagement/common/unsupportedExtensionsMigration';
1010
import { INativeServerExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
1111
import { ILogService } from 'vs/platform/log/common/log';
12-
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
12+
import { IStorageService } from 'vs/platform/storage/common/storage';
1313

1414
export class ExtensionsContributions extends Disposable {
1515
constructor(
@@ -22,9 +22,6 @@ export class ExtensionsContributions extends Disposable {
2222
) {
2323
super();
2424

25-
extensionManagementService.migrateDefaultProfileExtensions()
26-
.then(() => storageService.store(DEFAULT_PROFILE_EXTENSIONS_MIGRATION_KEY, true, StorageScope.APPLICATION, StorageTarget.MACHINE), error => null);
27-
2825
extensionManagementService.removeUninstalledExtensions();
2926
migrateUnsupportedExtensions(extensionManagementService, extensionGalleryService, extensionStorageService, extensionEnablementService, logService);
3027
ExtensionStorageService.removeOutdatedExtensionVersions(extensionManagementService, storageService);

‎src/vs/editor/browser/controller/textAreaHandler.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@
3333
}*/
3434
.monaco-editor .inputarea.ime-input {
3535
z-index: 10;
36+
caret-color: var(--vscode-editorCursor-foreground);
37+
color: var(--vscode-editor-foreground);
3638
}

‎src/vs/editor/browser/viewParts/indentGuides/indentGuides.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,11 @@
77
position: absolute;
88
box-sizing: border-box;
99
}
10+
11+
.monaco-editor .lines-content .core-guide-indent {
12+
box-shadow: 1px 0 0 0 var(--vscode-editorIndentGuide-background) inset;
13+
}
14+
15+
.monaco-editor .lines-content .core-guide-indent-active {
16+
box-shadow: 1px 0 0 0 var(--vscode-editorIndentGuide-activeBackground, --vscode-editorIndentGuide-background) inset;
17+
}

‎src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import 'vs/css!./indentGuides';
77
import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
8-
import { editorActiveIndentGuides, editorBracketHighlightingForeground1, editorBracketHighlightingForeground2, editorBracketHighlightingForeground3, editorBracketHighlightingForeground4, editorBracketHighlightingForeground5, editorBracketHighlightingForeground6, editorBracketPairGuideActiveBackground1, editorBracketPairGuideActiveBackground2, editorBracketPairGuideActiveBackground3, editorBracketPairGuideActiveBackground4, editorBracketPairGuideActiveBackground5, editorBracketPairGuideActiveBackground6, editorBracketPairGuideBackground1, editorBracketPairGuideBackground2, editorBracketPairGuideBackground3, editorBracketPairGuideBackground4, editorBracketPairGuideBackground5, editorBracketPairGuideBackground6, editorIndentGuides } from 'vs/editor/common/core/editorColorRegistry';
8+
import { editorBracketHighlightingForeground1, editorBracketHighlightingForeground2, editorBracketHighlightingForeground3, editorBracketHighlightingForeground4, editorBracketHighlightingForeground5, editorBracketHighlightingForeground6, editorBracketPairGuideActiveBackground1, editorBracketPairGuideActiveBackground2, editorBracketPairGuideActiveBackground3, editorBracketPairGuideActiveBackground4, editorBracketPairGuideActiveBackground5, editorBracketPairGuideActiveBackground6, editorBracketPairGuideBackground1, editorBracketPairGuideBackground2, editorBracketPairGuideBackground3, editorBracketPairGuideBackground4, editorBracketPairGuideBackground5, editorBracketPairGuideBackground6 } from 'vs/editor/common/core/editorColorRegistry';
99
import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
1010
import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
1111
import * as viewEvents from 'vs/editor/common/viewEvents';
@@ -259,14 +259,6 @@ function transparentToUndefined(color: Color | undefined): Color | undefined {
259259
}
260260

261261
registerThemingParticipant((theme, collector) => {
262-
const editorIndentGuidesColor = theme.getColor(editorIndentGuides);
263-
if (editorIndentGuidesColor) {
264-
collector.addRule(`.monaco-editor .lines-content .core-guide-indent { box-shadow: 1px 0 0 0 ${editorIndentGuidesColor} inset; }`);
265-
}
266-
const editorActiveIndentGuidesColor = theme.getColor(editorActiveIndentGuides) || editorIndentGuidesColor;
267-
if (editorActiveIndentGuidesColor) {
268-
collector.addRule(`.monaco-editor .lines-content .core-guide-indent-active { box-shadow: 1px 0 0 0 ${editorActiveIndentGuidesColor} inset; }`);
269-
}
270262

271263
const colors = [
272264
{ bracketColor: editorBracketHighlightingForeground1, guideColor: editorBracketPairGuideBackground1, guideColorActive: editorBracketPairGuideActiveBackground1 },

0 commit comments

Comments
 (0)