Skip to content

Commit 8520787

Browse files
swordensenswordensen
committed
Revert "Merge branch 'main' into main"
This reverts commit 78ed36c, reversing changes made to 7b96d0e.
1 parent 47430d6 commit 8520787

File tree

82 files changed

+461
-808
lines changed

Some content is hidden

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

82 files changed

+461
-808
lines changed

‎.vscode/notebooks/my-work.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
{
8383
"kind": 2,
8484
"language": "github-issues",
85-
"value": "$REPOS is:open assignee:@me label:triage-needed\n"
85+
"value": "repo:microsoft/vscode is:open assignee:@me label:triage-needed\n"
8686
},
8787
{
8888
"kind": 1,

‎build/lib/stylelint/vscode-known-variables.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,6 @@
491491
"--vscode-panelTitle-activeBorder",
492492
"--vscode-panelTitle-activeForeground",
493493
"--vscode-panelTitle-inactiveForeground",
494-
"--vscode-panelStickyScroll-background",
495-
"--vscode-panelStickyScroll-border",
496-
"--vscode-panelStickyScroll-shadow",
497494
"--vscode-peekView-border",
498495
"--vscode-peekViewEditor-background",
499496
"--vscode-peekViewEditor-matchHighlightBackground",
@@ -570,9 +567,6 @@
570567
"--vscode-sideBarSectionHeader-foreground",
571568
"--vscode-sideBarTitle-background",
572569
"--vscode-sideBarTitle-foreground",
573-
"--vscode-sideBarStickyScroll-background",
574-
"--vscode-sideBarStickyScroll-border",
575-
"--vscode-sideBarStickyScroll-shadow",
576570
"--vscode-sideBySideEditor-horizontalBorder",
577571
"--vscode-sideBySideEditor-verticalBorder",
578572
"--vscode-simpleFindWidget-sashBorder",

‎extensions/markdown-language-features/server/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vscode-markdown-languageserver",
33
"description": "Markdown language server",
4-
"version": "0.5.0-alpha.4",
4+
"version": "0.5.0-alpha.3",
55
"author": "Microsoft Corporation",
66
"license": "MIT",
77
"engines": {
@@ -18,7 +18,7 @@
1818
"vscode-languageserver": "^8.1.0",
1919
"vscode-languageserver-textdocument": "^1.0.8",
2020
"vscode-languageserver-types": "^3.17.3",
21-
"vscode-markdown-languageservice": "^0.5.0-alpha.4",
21+
"vscode-markdown-languageservice": "^0.5.0-alpha.3",
2222
"vscode-uri": "^3.0.7"
2323
},
2424
"devDependencies": {

‎extensions/markdown-language-features/server/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ vscode-languageserver@^8.1.0:
151151
dependencies:
152152
vscode-languageserver-protocol "3.17.3"
153153

154-
vscode-markdown-languageservice@^0.5.0-alpha.4:
155-
version "0.5.0-alpha.4"
156-
resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.4.tgz#900faff6cb0784495117399bc6215691f7800d9b"
157-
integrity sha512-Df6GzywR5cJ3LfBio3Fx45MfJJwDBVg5tcfpzH9XTvExYeHd1pHOUKssJLW4LBSX4bXwiFsNqrOB8va03d8LQQ==
154+
vscode-markdown-languageservice@^0.5.0-alpha.3:
155+
version "0.5.0-alpha.3"
156+
resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.3.tgz#417e853c73ce2e1a2460e52d8868576365d6cb05"
157+
integrity sha512-wD9LO4CWtrp7dqbQBoQ6HbQpDpN2lUTC6SvDDjhZVDqRU0XqJP5YyO4FsvY+MWwz75b3QwapYYv4635EY4xhrA==
158158
dependencies:
159159
"@vscode/l10n" "^0.0.10"
160160
node-html-parser "^6.1.5"

‎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.89.0",
4-
"distro": "51cc447f78b8a92b468906c0718cda74314ba794",
4+
"distro": "340432a8308f66007779ec2133ee39e6995006cb",
55
"author": {
66
"name": "Microsoft Corporation"
77
},

‎product.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
},
6767
{
6868
"name": "ms-vscode.vscode-js-profile-table",
69-
"version": "1.0.9",
70-
"sha256": "3b62ee4276a2bbea3fe230f94b1d5edd915b05966090ea56f882e1e0ab53e1a6",
69+
"version": "1.0.8",
70+
"sha256": "ca30069e21fbf576b49638ff8ff7c316b028c2faca924c23526737c65b8762bf",
7171
"repo": "https://github.com/microsoft/vscode-js-profile-visualizer",
7272
"metadata": {
7373
"id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb",

‎resources/linux/code.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Name=@@NAME_LONG@@
33
Comment=Code Editing. Redefined.
44
GenericName=Text Editor
5-
Exec=@@EXEC@@ %F
5+
Exec=@@EXEC@@ --unity-launch %F
66
Icon=@@ICON@@
77
Type=Application
88
StartupNotify=false

‎src/vs/base/browser/touch.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -192,28 +192,28 @@ export class Gesture extends Disposable {
192192
holdTime = Date.now() - data.initialTimeStamp;
193193

194194
if (holdTime < Gesture.HOLD_DELAY
195-
&& Math.abs(data.initialPageX - arrays.tail(data.rollingPageX)!) < 30
196-
&& Math.abs(data.initialPageY - arrays.tail(data.rollingPageY)!) < 30) {
195+
&& Math.abs(data.initialPageX - arrays.tail(data.rollingPageX)) < 30
196+
&& Math.abs(data.initialPageY - arrays.tail(data.rollingPageY)) < 30) {
197197

198198
const evt = this.newGestureEvent(EventType.Tap, data.initialTarget);
199-
evt.pageX = arrays.tail(data.rollingPageX)!;
200-
evt.pageY = arrays.tail(data.rollingPageY)!;
199+
evt.pageX = arrays.tail(data.rollingPageX);
200+
evt.pageY = arrays.tail(data.rollingPageY);
201201
this.dispatchEvent(evt);
202202

203203
} else if (holdTime >= Gesture.HOLD_DELAY
204-
&& Math.abs(data.initialPageX - arrays.tail(data.rollingPageX)!) < 30
205-
&& Math.abs(data.initialPageY - arrays.tail(data.rollingPageY)!) < 30) {
204+
&& Math.abs(data.initialPageX - arrays.tail(data.rollingPageX)) < 30
205+
&& Math.abs(data.initialPageY - arrays.tail(data.rollingPageY)) < 30) {
206206

207207
const evt = this.newGestureEvent(EventType.Contextmenu, data.initialTarget);
208-
evt.pageX = arrays.tail(data.rollingPageX)!;
209-
evt.pageY = arrays.tail(data.rollingPageY)!;
208+
evt.pageX = arrays.tail(data.rollingPageX);
209+
evt.pageY = arrays.tail(data.rollingPageY);
210210
this.dispatchEvent(evt);
211211

212212
} else if (activeTouchCount === 1) {
213-
const finalX = arrays.tail(data.rollingPageX)!;
214-
const finalY = arrays.tail(data.rollingPageY)!;
213+
const finalX = arrays.tail(data.rollingPageX);
214+
const finalY = arrays.tail(data.rollingPageY);
215215

216-
const deltaT = arrays.tail(data.rollingTimestamps)! - data.rollingTimestamps[0];
216+
const deltaT = arrays.tail(data.rollingTimestamps) - data.rollingTimestamps[0];
217217
const deltaX = finalX - data.rollingPageX[0];
218218
const deltaY = finalY - data.rollingPageY[0];
219219

@@ -345,8 +345,8 @@ export class Gesture extends Disposable {
345345
const data = this.activeTouches[touch.identifier];
346346

347347
const evt = this.newGestureEvent(EventType.Change, data.initialTarget);
348-
evt.translationX = touch.pageX - arrays.tail(data.rollingPageX)!;
349-
evt.translationY = touch.pageY - arrays.tail(data.rollingPageY)!;
348+
evt.translationX = touch.pageX - arrays.tail(data.rollingPageX);
349+
evt.translationY = touch.pageY - arrays.tail(data.rollingPageY);
350350
evt.pageX = touch.pageX;
351351
evt.pageY = touch.pageY;
352352
this.dispatchEvent(evt);

‎src/vs/base/browser/ui/list/listWidget.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,9 +1094,6 @@ export interface IListStyles {
10941094
listHoverOutline: string | undefined;
10951095
treeIndentGuidesStroke: string | undefined;
10961096
treeInactiveIndentGuidesStroke: string | undefined;
1097-
treeStickyScrollBackground: string | undefined;
1098-
treeStickyScrollBorder: string | undefined;
1099-
treeStickyScrollShadow: string | undefined;
11001097
tableColumnsBorder: string | undefined;
11011098
tableOddRowsBackgroundColor: string | undefined;
11021099
}
@@ -1127,10 +1124,7 @@ export const unthemedListStyles: IListStyles = {
11271124
listFocusOutline: undefined,
11281125
listInactiveFocusOutline: undefined,
11291126
listSelectionOutline: undefined,
1130-
listHoverOutline: undefined,
1131-
treeStickyScrollBackground: undefined,
1132-
treeStickyScrollBorder: undefined,
1133-
treeStickyScrollShadow: undefined
1127+
listHoverOutline: undefined
11341128
};
11351129

11361130
const DefaultOptions: IListOptions<any> = {

‎src/vs/base/browser/ui/tree/abstractTree.ts

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2772,20 +2772,9 @@ export abstract class AbstractTree implements IDisposable
27722772
}
27732773

27742774
// Sticky Scroll Background
2775-
const stickyScrollBackground = styles.treeStickyScrollBackground ?? styles.listBackground;
2776-
if (stickyScrollBackground) {
2777-
content.push(`.monaco-list${suffix} .monaco-scrollable-element .monaco-tree-sticky-container { background-color: ${stickyScrollBackground}; }`);
2778-
content.push(`.monaco-list${suffix} .monaco-scrollable-element .monaco-tree-sticky-container .monaco-tree-sticky-row { background-color: ${stickyScrollBackground}; }`);
2779-
}
2780-
2781-
// Sticky Scroll Border
2782-
if (styles.treeStickyScrollBorder) {
2783-
content.push(`.monaco-list${suffix} .monaco-scrollable-element .monaco-tree-sticky-container { border-bottom: 1px solid ${styles.treeStickyScrollBorder}; }`);
2784-
}
2785-
2786-
// Sticky Scroll Shadow
2787-
if (styles.treeStickyScrollShadow) {
2788-
content.push(`.monaco-list${suffix} .monaco-scrollable-element .monaco-tree-sticky-container .monaco-tree-sticky-container-shadow { box-shadow: ${styles.treeStickyScrollShadow} 0 6px 6px -6px inset; height: 3px; }`);
2775+
if (styles.listBackground) {
2776+
content.push(`.monaco-list${suffix} .monaco-scrollable-element .monaco-tree-sticky-container { background-color: ${styles.listBackground}; }`);
2777+
content.push(`.monaco-list${suffix} .monaco-scrollable-element .monaco-tree-sticky-container .monaco-tree-sticky-row { background-color: ${styles.listBackground}; }`);
27892778
}
27902779

27912780
// Sticky Scroll Focus

‎src/vs/base/browser/ui/tree/media/tree.css

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
height: 0;
138138
z-index: 13; /* Settings editor uses z-index: 12 */
139139

140-
/* Backup color in case the tree does not provide the background color */
140+
/* TODO@benibenj temporary solution, all lists should provide their background */
141141
background-color: var(--vscode-sideBar-background);
142142
}
143143

@@ -147,7 +147,7 @@
147147
opacity: 1 !important; /* Settings editor uses opacity < 1 */
148148
overflow: hidden;
149149

150-
/* Backup color in case the tree does not provide the background color */
150+
/* TODO@benibenj temporary solution, all lists should provide their background */
151151
background-color: var(--vscode-sideBar-background);
152152
}
153153

@@ -161,12 +161,13 @@
161161
display: none;
162162
}
163163

164-
.monaco-list .monaco-scrollable-element .monaco-tree-sticky-container .monaco-tree-sticky-container-shadow {
164+
.monaco-list .monaco-scrollable-element .monaco-tree-sticky-container .monaco-tree-sticky-container-shadow{
165165
position: absolute;
166166
bottom: -3px;
167167
left: 0px;
168-
height: 0px; /* heigt is 3px and only set when there is a treeStickyScrollShadow color */
168+
height: 3px;
169169
width: 100%;
170+
box-shadow: var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset;
170171
}
171172

172173
.monaco-list .monaco-scrollable-element .monaco-tree-sticky-container[tabindex="0"]:focus{

‎src/vs/base/common/arrays.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { findFirstIdxMonotonousOrArrLen } from './arraysFind';
1313
* @param array The array.
1414
* @param n Which element from the end (default is zero).
1515
*/
16-
export function tail<T>(array: ArrayLike<T>, n: number = 0): T | undefined {
16+
export function tail<T>(array: ArrayLike<T>, n: number = 0): T {
1717
return array[array.length - (1 + n)];
1818
}
1919

‎src/vs/base/common/network.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,6 @@ export namespace Schemas {
113113
*/
114114
export const vscodeSourceControl = 'vscode-scm';
115115

116-
/**
117-
* Scheme used for input box for creating comments.
118-
*/
119-
export const commentsInput = 'comment';
120-
121116
/**
122117
* Scheme used for special rendering of settings in the release notes
123118
*/

‎src/vs/base/common/types.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,3 @@ export type DeepRequiredNonNullable = {
243243
export type DeepPartial<T> = {
244244
[P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : Partial<T[P]>;
245245
};
246-
247-
/**
248-
* Represents a type that is a partial version of a given type `T`, except a subset.
249-
*/
250-
export type PartialExcept<T, K extends keyof T> = Partial<Omit<T, K>> & Pick<T, K>;

‎src/vs/code/electron-main/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,7 @@ export class CodeApplication extends Disposable {
13561356
return windowsMainService.open({
13571357
context,
13581358
cli: args,
1359-
forceNewWindow: args['new-window'],
1359+
forceNewWindow: args['new-window'] || (!hasCliArgs && args['unity-launch']),
13601360
diffMode: args.diff,
13611361
mergeMode: args.merge,
13621362
noRecentEntry,

‎src/vs/editor/browser/stableEditorScroll.ts

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -62,44 +62,3 @@ export class StableEditorScrollState {
6262
editor.setScrollTop(editor.getScrollTop() + offset);
6363
}
6464
}
65-
66-
67-
export class StableEditorBottomScrollState {
68-
69-
public static capture(editor: ICodeEditor): StableEditorBottomScrollState {
70-
if (editor.hasPendingScrollAnimation()) {
71-
// Never mess with the scroll if there is a pending scroll animation
72-
return new StableEditorBottomScrollState(editor.getScrollTop(), editor.getContentHeight(), null, 0);
73-
}
74-
75-
let visiblePosition: Position | null = null;
76-
let visiblePositionScrollDelta = 0;
77-
const visibleRanges = editor.getVisibleRanges();
78-
if (visibleRanges.length > 0) {
79-
visiblePosition = visibleRanges.at(-1)!.getEndPosition();
80-
const visiblePositionScrollBottom = editor.getBottomForLineNumber(visiblePosition.lineNumber);
81-
visiblePositionScrollDelta = (editor.getScrollTop() + editor.getLayoutInfo().height) - visiblePositionScrollBottom;
82-
}
83-
return new StableEditorBottomScrollState(editor.getScrollTop(), editor.getContentHeight(), visiblePosition, visiblePositionScrollDelta);
84-
}
85-
86-
constructor(
87-
private readonly _initialScrollTop: number,
88-
private readonly _initialContentHeight: number,
89-
private readonly _visiblePosition: Position | null,
90-
private readonly _visiblePositionScrollDelta: number,
91-
) {
92-
}
93-
94-
public restore(editor: ICodeEditor): void {
95-
if (this._initialContentHeight === editor.getContentHeight() && this._initialScrollTop === editor.getScrollTop()) {
96-
// The editor's content height and scroll top haven't changed, so we don't need to do anything
97-
return;
98-
}
99-
100-
if (this._visiblePosition) {
101-
const visiblePositionScrollBottom = editor.getBottomForLineNumber(this._visiblePosition.lineNumber);
102-
editor.setScrollTop(visiblePositionScrollBottom - (this._visiblePositionScrollDelta + editor.getLayoutInfo().height));
103-
}
104-
}
105-
}

‎src/vs/editor/contrib/codeAction/browser/lightBulbWidget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
6868
super();
6969

7070
this._domNode = dom.$('div.lightBulbWidget');
71-
this._domNode.role = 'menu';
71+
7272
this._register(Gesture.ignoreTarget(this._domNode));
7373

7474
this._editor.addContentWidget(this);

‎src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class ShowOrFocusStandaloneColorPicker extends EditorAction2 {
1818
super({
1919
id: 'editor.action.showOrFocusStandaloneColorPicker',
2020
title: {
21-
...localize2('showOrFocusStandaloneColorPicker', "Show or focus a standalone color picker which uses the default color provider. It displays hex/rgb/hsl colors."),
21+
...localize2('showOrFocusStandaloneColorPicker', "Show or Focus Standalone Color Picker"),
2222
mnemonicTitle: localize({ key: 'mishowOrFocusStandaloneColorPicker', comment: ['&& denotes a mnemonic'] }, "&&Show or Focus Standalone Color Picker"),
2323
},
2424
precondition: undefined,
@@ -47,9 +47,6 @@ class HideStandaloneColorPicker extends EditorAction {
4747
kbOpts: {
4848
primary: KeyCode.Escape,
4949
weight: KeybindingWeight.EditorContrib
50-
},
51-
metadata: {
52-
description: localize2('hideColorPickerDescription', "Hide the standalone color picker."),
5350
}
5451
});
5552
}
@@ -73,9 +70,6 @@ class InsertColorWithStandaloneColorPicker extends EditorAction {
7370
kbOpts: {
7471
primary: KeyCode.Enter,
7572
weight: KeybindingWeight.EditorContrib
76-
},
77-
metadata: {
78-
description: localize2('insertColorWithStandaloneColorPickerDescription', "Insert hex/rgb/hsl colors with the focused standalone color picker."),
7973
}
8074
});
8175
}

0 commit comments

Comments
 (0)