From 7a5936976f7dd872725aca0b7d69bd3bb2b92625 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 19 Mar 2023 01:26:17 +0100 Subject: [PATCH] fix: update patches --- insider.json | 2 +- patches/feat-announcements.patch | 30 ++++++++++++---------------- patches/insider/add-remote-url.patch | 11 +++++----- patches/remove-mangle.patch | 12 +++++------ product.json | 21 +++++++++++++++---- 5 files changed, 43 insertions(+), 33 deletions(-) diff --git a/insider.json b/insider.json index ff9af55..90a1721 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.77.0", - "commit": "155cd6db223feb1f8c734ca70e108b9efec7b054" + "commit": "2a6bd78f745d3e6330c8ff7db5282dc582e117fd" } diff --git a/patches/feat-announcements.patch b/patches/feat-announcements.patch index d4f2de3..839bc99 100644 --- a/patches/feat-announcements.patch +++ b/patches/feat-announcements.patch @@ -1,8 +1,8 @@ diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts -index 2c18fde..e1031dd 100644 +index 3ef5ca1..a634a9f 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts -@@ -312,2 +312,8 @@ configurationRegistry.registerConfiguration({ +@@ -301,2 +301,8 @@ configurationRegistry.registerConfiguration({ }, + 'workbench.welcomePage.extraAnnouncements': { + scope: ConfigurationScope.MACHINE, @@ -12,10 +12,10 @@ index 2c18fde..e1031dd 100644 + }, 'workbench.startupEditor': { diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts -index 9564618..eb8adfe 100644 +index 46949b2..174e65f 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts -@@ -116,4 +116,8 @@ type GettingStartedActionEvent = { +@@ -118,4 +118,8 @@ type GettingStartedActionEvent = { type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string }; +type AnnouncementEntry = { id: string, title: string, url: string }; @@ -24,30 +24,26 @@ index 9564618..eb8adfe 100644 +const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */]; + export class GettingStartedPage extends EditorPane { -@@ -148,2 +152,4 @@ export class GettingStartedPage extends EditorPane { +@@ -152,2 +156,4 @@ export class GettingStartedPage extends EditorPane { private gettingStartedList?: GettingStartedIndexList; + private announcementList?: GettingStartedIndexList; + private announcementData?: AnnouncementEntry[]; - -@@ -760,3 +766,2 @@ export class GettingStartedPage extends EditorPane { - -- - const leftColumn = $('.categories-column.categories-column-left', {},); -@@ -767,2 +772,3 @@ export class GettingStartedPage extends EditorPane { + private featuredExtensionsList?: GettingStartedIndexList; +@@ -804,2 +810,3 @@ export class GettingStartedPage extends EditorPane { const gettingStartedList = this.buildGettingStartedWalkthroughsList(); + const announcementList = await this.buildAnnouncementList(); -@@ -777,3 +783,3 @@ export class GettingStartedPage extends EditorPane { +@@ -815,3 +822,3 @@ export class GettingStartedPage extends EditorPane { this.container.classList.remove('noWalkthroughs'); - reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); + reset(leftColumn, startList.getDomElement(), recentList.getDomElement(), announcementList.getDomElement()); - reset(rightColumn, gettingStartedList.getDomElement()); -@@ -783,3 +789,3 @@ export class GettingStartedPage extends EditorPane { + reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement()); +@@ -820,3 +827,3 @@ export class GettingStartedPage extends EditorPane { this.container.classList.add('noWalkthroughs'); -- reset(leftColumn, startList.getDomElement()); +- reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); + reset(leftColumn, startList.getDomElement(), announcementList.getDomElement()); - reset(rightColumn, recentList.getDomElement()); -@@ -930,2 +936,51 @@ export class GettingStartedPage extends EditorPane { + reset(rightColumn, featuredExtensionList.getDomElement()); +@@ -982,2 +989,51 @@ export class GettingStartedPage extends EditorPane { + private async buildAnnouncementList(): Promise> { + const renderAnnouncement = (announcement: AnnouncementEntry) => { diff --git a/patches/insider/add-remote-url.patch b/patches/insider/add-remote-url.patch index ca335de..e613c48 100644 --- a/patches/insider/add-remote-url.patch +++ b/patches/insider/add-remote-url.patch @@ -1,14 +1,14 @@ diff --git a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts -index 63e7f2d..e9a6b7d 100644 +index 932a92c..afa3272 100644 --- a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts +++ b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts -@@ -13,2 +13,4 @@ import { RemoteStatusIndicator } from 'vs/workbench/contrib/remote/browser/remot - import { AutomaticPortForwarding, ForwardedPortsView, PortRestore } from 'vs/workbench/contrib/remote/browser/remoteExplorer'; +@@ -14,2 +14,4 @@ import { AutomaticPortForwarding, ForwardedPortsView, PortRestore } from 'vs/wor + import { RemoteStartEntry } from 'vs/workbench/contrib/remote/browser/remoteStartEntry'; +import { CommandsRegistry } from 'vs/platform/commands/common/commands'; +import { localize } from 'vs/nls'; -@@ -23 +25,13 @@ workbenchContributionsRegistry.registerWorkbenchContribution(AutomaticPortForwar - workbenchContributionsRegistry.registerWorkbenchContribution(RemoteMarkers, LifecyclePhase.Eventually); +@@ -25 +27,13 @@ workbenchContributionsRegistry.registerWorkbenchContribution(RemoteMarkers, Life + workbenchContributionsRegistry.registerWorkbenchContribution(RemoteStartEntry, LifecyclePhase.Starting); + +CommandsRegistry.registerCommand({ + id: 'remote.serverDownloadUrlTemplate', @@ -21,3 +21,4 @@ index 63e7f2d..e9a6b7d 100644 + return 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz'; + } +}); +\ No newline at end of file diff --git a/patches/remove-mangle.patch b/patches/remove-mangle.patch index 31606ca..aa9490e 100644 --- a/patches/remove-mangle.patch +++ b/patches/remove-mangle.patch @@ -1,16 +1,16 @@ diff --git a/build/lib/compilation.js b/build/lib/compilation.js -index cfd735b..d5179ac 100644 +index 63ddeb2..31d2f35 100644 --- a/build/lib/compilation.js +++ b/build/lib/compilation.js @@ -21,3 +21,2 @@ const File = require("vinyl"); const task = require("./task"); -const mangleTypeScript_1 = require("./mangleTypeScript"); const watch = require('./watch'); -@@ -104,24 +103,3 @@ function compileTask(src, out, build) { +@@ -104,24 +103,3 @@ function compileTask(src, out, build, options = {}) { } - // mangle: TypeScript to TypeScript - let mangleStream = es.through(); -- if (build) { +- if (build && !options.disableMangle) { - let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data)); - const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState'])); - mangleStream = es.through(function write(data) { @@ -32,7 +32,7 @@ index cfd735b..d5179ac 100644 - .pipe(mangleStream) .pipe(generator.stream) diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts -index 4f890b8..27ea44c 100644 +index d5cd196..afe16d3 100644 --- a/build/lib/compilation.ts +++ b/build/lib/compilation.ts @@ -19,4 +19,2 @@ import * as File from 'vinyl'; @@ -40,11 +40,11 @@ index 4f890b8..27ea44c 100644 -import { Mangler } from './mangleTypeScript'; -import { RawSourceMap } from 'source-map'; const watch = require('./watch'); -@@ -123,26 +121,3 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod +@@ -123,26 +121,3 @@ export function compileTask(src: string, out: string, build: boolean, options: { - // mangle: TypeScript to TypeScript - let mangleStream = es.through(); -- if (build) { +- if (build && !options.disableMangle) { - let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data)); - const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState'])); - mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) { diff --git a/product.json b/product.json index f734295..60a478a 100644 --- a/product.json +++ b/product.json @@ -56,6 +56,7 @@ ], "ms-vsliveshare.vsliveshare": [ "contribMenuBarHome", + "contribShareMenu", "diffCommand", "documentFiltersExclusive", "fileSearchProvider", @@ -76,6 +77,7 @@ "resolvers" ], "ms-python.python": [ + "contribEditorContentMenu", "quickPickSortByLabel", "testObserver", "envShellEvent" @@ -100,6 +102,8 @@ "textSearchProvider" ], "ms-vscode.remote-repositories": [ + "contribEditorLineNumberMenu", + "contribEditorGutterMenu", "contribEditSessions", "contribRemoteHelp", "contribMenuBarHome", @@ -133,7 +137,8 @@ "telemetry" ], "ms-vscode.remote-server": [ - "resolvers" + "resolvers", + "tunnels" ], "ms-vscode.remote-explorer": [ "contribRemoteHelp", @@ -159,6 +164,8 @@ "documentFiltersExclusive" ], "GitHub.vscode-pull-request-github": [ + "contribEditorLineNumberMenu", + "contribEditorGutterMenu", "contribCommentThreadAdditionalMenu", "tokenInformation", "contribShareMenu", @@ -170,10 +177,12 @@ "quickDiffProvider" ], "GitHub.copilot": [ - "inlineCompletionsAdditions" + "inlineCompletionsAdditions", + "interactive" ], "GitHub.copilot-nightly": [ - "inlineCompletionsAdditions" + "inlineCompletionsAdditions", + "interactive" ], "GitHub.remotehub": [ "contribRemoteHelp", @@ -210,7 +219,8 @@ "notebookKernelSource", "interactiveWindow", "notebookControllerAffinityHidden", - "contribNotebookStaticPreloads" + "contribNotebookStaticPreloads", + "quickPickItemTooltip" ], "dbaeumer.vscode-eslint": [ "notebookCellExecutionState" @@ -230,6 +240,9 @@ "redhat.java": [ "documentPaste" ], + "ms-dotnettools.visual-studio-green": [ + "inlineCompletionsAdditions" + ], "jeanp413.open-remote-ssh": [ "resolvers", "tunnels",