Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace map by forEach to prevent treeshaking #264

Merged
merged 2 commits into from
Nov 28, 2023
Merged

Replace map by forEach to prevent treeshaking #264

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5e137e
fix: replace map by forEach to prevent treeshaking
Nov 27, 2023
e0cf32f
fix: use a probably better fix
Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 103 additions & 0 deletions scripts/vscode.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,70 @@ index cf9154ce7d6..5c954f75f8e 100644

public static validateOptions(options: IEditorOptions): ValidatedEditorOptions {
const result = new ValidatedEditorOptions();
diff --git a/src/vs/editor/contrib/find/browser/findController.ts b/src/vs/editor/contrib/find/browser/findController.ts
index ce1cdb9084e..7083bcde458 100644
--- a/src/vs/editor/contrib/find/browser/findController.ts
+++ b/src/vs/editor/contrib/find/browser/findController.ts
@@ -30,6 +30,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { IThemeService, themeColorFromId } from 'vs/platform/theme/common/themeService';
+import { Selection } from 'vs/editor/common/core/selection';

const SEARCH_STRING_MAX_LENGTH = 524288;

@@ -258,8 +259,8 @@ export class CommonFindController extends Disposable implements IEditorContribut
this._state.change({ searchScope: null }, true);
} else {
if (this._editor.hasModel()) {
- const selections = this._editor.getSelections();
- selections.map(selection => {
+ let selections = this._editor.getSelections();
+ selections = selections.map(selection => {
if (selection.endColumn === 1 && selection.endLineNumber > selection.startLineNumber) {
selection = selection.setEndPosition(
selection.endLineNumber - 1,
@@ -270,7 +271,7 @@ export class CommonFindController extends Disposable implements IEditorContribut
return selection;
}
return null;
- }).filter(element => !!element);
CGNonofr marked this conversation as resolved.
Show resolved Hide resolved
+ }).filter((element): element is Selection => !!element);

if (selections.length) {
this._state.change({ searchScope: selections }, true);
diff --git a/src/vs/editor/contrib/find/browser/findWidget.ts b/src/vs/editor/contrib/find/browser/findWidget.ts
index a7dd879a53e..9bf73d43298 100644
--- a/src/vs/editor/contrib/find/browser/findWidget.ts
+++ b/src/vs/editor/contrib/find/browser/findWidget.ts
@@ -43,6 +43,7 @@ import { ThemeIcon } from 'vs/base/common/themables';
import { isHighContrast } from 'vs/platform/theme/common/theme';
import { assertIsDefined } from 'vs/base/common/types';
import { defaultInputBoxStyles, defaultToggleStyles } from 'vs/platform/theme/browser/defaultStyles';
+import { Selection } from 'vs/editor/common/core/selection';

const findSelectionIcon = registerIcon('find-selection', Codicon.selection, nls.localize('findSelectionIcon', 'Icon for \'Find in Selection\' in the editor find widget.'));
const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, nls.localize('findCollapsedIcon', 'Icon to indicate that the editor find widget is collapsed.'));
@@ -1051,8 +1052,8 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
this._register(this._toggleSelectionFind.onChange(() => {
if (this._toggleSelectionFind.checked) {
if (this._codeEditor.hasModel()) {
- const selections = this._codeEditor.getSelections();
- selections.map(selection => {
+ let selections = this._codeEditor.getSelections();
+ selections = selections.map(selection => {
if (selection.endColumn === 1 && selection.endLineNumber > selection.startLineNumber) {
selection = selection.setEndPosition(selection.endLineNumber - 1, this._codeEditor.getModel()!.getLineMaxColumn(selection.endLineNumber - 1));
}
@@ -1060,7 +1061,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
return selection;
}
return null;
- }).filter(element => !!element);
+ }).filter((element): element is Selection => !!element);

if (selections.length) {
this._state.change({ searchScope: selections as Range[] }, true);
diff --git a/src/vs/editor/editor.main.ts b/src/vs/editor/editor.main.ts
index 23d547570e9..31dfb4fd8d4 100644
--- a/src/vs/editor/editor.main.ts
Expand Down Expand Up @@ -1268,6 +1332,19 @@ index afa384aa88c..bc631450591 100644
? compositeSwitcherBar.getHeight(currentItemsLength + index)
: compositeSwitcherBar.getWidth(currentItemsLength + index)
));
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
index 67d993e2f04..0fe14249c66 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
@@ -140,7 +140,7 @@ export class EditorGroupWatermark extends Disposable {

const update = () => {
clearNode(box);
- selected.map(entry => {
+ selected.forEach(entry => {
const keys = this.keybindingService.lookupKeybinding(entry.id);
if (!keys) {
return;
diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
index f23c48b7db1..3a638425a2d 100644
--- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
Expand Down Expand Up @@ -1321,6 +1398,19 @@ index 295c3fd59cb..d3aa77446b4 100644

if (!data.icon.complete) {
data.icon.style.visibility = 'hidden';
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index ff33245ded3..46c454d68a6 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -977,7 +977,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
order: 1,
});

- EXTENSION_CATEGORIES.map((category, index) => {
+ EXTENSION_CATEGORIES.forEach((category, index) => {
this.registerExtensionAction({
id: `extensions.actions.searchByCategory.${category}`,
title: category,
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 154696503e3..b1bb13e65ee 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
Expand All @@ -1343,6 +1433,19 @@ index 154696503e3..b1bb13e65ee 100644
}

get repository(): string | undefined {
diff --git a/src/vs/workbench/contrib/search/browser/searchModel.ts b/src/vs/workbench/contrib/search/browser/searchModel.ts
index f8261d8871b..ee73a4a9591 100644
--- a/src/vs/workbench/contrib/search/browser/searchModel.ts
+++ b/src/vs/workbench/contrib/search/browser/searchModel.ts
@@ -2356,7 +2356,7 @@ function textSearchResultToMatches(rawMatch: ITextSearchMatch, fileMatch: FileMa

export function textSearchMatchesToNotebookMatches(textSearchMatches: ITextSearchMatch[], cell: CellMatch): MatchInNotebook[] {
const notebookMatches: MatchInNotebook[] = [];
- textSearchMatches.map((textSearchMatch) => {
+ textSearchMatches.forEach((textSearchMatch) => {
const previewLines = textSearchMatch.preview.text.split('\n');
if (Array.isArray(textSearchMatch.ranges)) {
textSearchMatch.ranges.forEach((r, i) => {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index e6ae569ad9d..3b2ac782391 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
Expand Down