Skip to content

Commit

Permalink
Merge pull request #410 from CodinGame/remove-patch-signature
Browse files Browse the repository at this point in the history
Remove patch signature
  • Loading branch information
CGNonofr authored Apr 18, 2024
2 parents 59fd467 + 1568d1d commit 9243ee5
Show file tree
Hide file tree
Showing 52 changed files with 1 addition and 154 deletions.
2 changes: 1 addition & 1 deletion docs/vscode_monaco_upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
- Fetch the new tag: `git fetch origin <tag>`
- rebase on the new tag: `git rebase <tag>`
- Resolve conflicts / update code (e.g. broken imports)
- Generate new patch: `rm -rf ../monaco-vscode-api/vscode-paches && git format-patch --zero-commit --no-numbered <tag>.. -o '../monaco-vscode-api/vscode-paches'`
- Generate new patch: `rm -rf ../monaco-vscode-api/vscode-paches && git format-patch --zero-commit --no-numbered --no-signature <tag>.. -o '../monaco-vscode-api/vscode-paches'`

## monaco-vscode-api repository

Expand Down
3 changes: 0 additions & 3 deletions vscode-paches/0001-fix-allow-importing-vscode-oniguruma.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@ index b174b6f348a..851564cf0e5 100644
"worker_threads",
"@xterm/addon-canvas",
"@xterm/addon-image",
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0002-fix-fix-editor-api-types.patch
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,3 @@ index 22b70a953df..e781d39d9e2 100644
}

if (line.indexOf('\tMonacoEnvironment?') === 0) {
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,3 @@ index 775a1be5996..ce8435bd920 100644
relativePath = relativePath.replace(/\\/g, '/');
if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
relativePath = './' + relativePath;
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,3 @@ index e781d39d9e2..4c92c45941a 100644
),
finalEditorResourcesTask
)
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0005-feat-output-es2020.patch
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,3 @@ index 988f0485713..c73b524ea2a 100644
"sourceMap": false,
"declaration": true
},
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,3 @@ index 233840e65ab..ff3661e3472 100644
}

/**
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@ index 30639672490..2095905a4d8 100644

return startClient((id: string, name: string, clientOptions: LanguageClientOptions) => {
return new LanguageClient(id, name, clientOptions, worker);
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0008-fix-typescript-handle-trailing-slash.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@ index e92548950fc..b24ba5155d3 100644
});
}

--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0009-fix-typescript-missing-default-value.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@ index b24ba5155d3..a0c2c248f96 100644
}

export function looksLikeLibDtsPath(filepath: string) {
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0010-fix-typescript-handle-missing-case.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,3 @@ index 7c40993d6df..950ed338c30 100644
break;
case 'event::beginInstallTypes':
case 'event::endInstallTypes':
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0011-feat-add-static-asset-url-mechanism.patch
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,3 @@ index 86136a080e6..8a2608599ee 100644

onTerminate = (reason: string) => extHostMain.terminate(reason);
});
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0012-fix-remove-import-in-ESM.patch
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,3 @@ index 71391b063f3..7878de1cbfa 100644
import { IWorker, IWorkerCallback, IWorkerFactory, logOnceWebWorkerWarning } from 'vs/base/common/worker/simpleWorker';
import { Disposable, toDisposable } from 'vs/base/common/lifecycle';

--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@ index 02154e77b68..d7f257db934 100644
}

.codicon[class*='codicon-'] {
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0014-fix-ESM-version-of-performance.patch
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,3 @@ index aff4d0734de..ea43e4a2fcc 100644
+// return result;
+// };
+// ESM-uncomment-end
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,3 @@ index c0a4b9d1cf3..f260372b1fc 100644
return new TestConfiguration(options);
}
protected override _createView(viewModel: ViewModel): [View, boolean] {
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0016-fix-use-existing-method.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@ index c3d2f3c41c3..9e012841726 100644
for (const resolvedKeybinding of resolvedKeybindings) {
result[resultLen++] = new ResolvedKeybindingItem(resolvedKeybinding, item.command, item.commandArgs, when, isDefault, null, false);
}
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0017-refactor-split-code.patch
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,3 @@ index 76b3fa79a5c..3c98bf9aec0 100644
this._cachedResolver = new KeybindingResolver(defaults, overrides, (str) => this._log(str));
}
return this._cachedResolver;
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,3 @@ index df611c4ad7f..85fc1c5f58d 100644
onDidInitialize.fire();

return instantiationService;
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,3 @@ index ad67fb4f422..fadf86cece5 100644

// ensure to limit buffer for guessing due to https://github.com/aadsm/jschardet/issues/53
const limitedBuffer = buffer.slice(0, AUTO_ENCODING_GUESS_MAX_BYTES);
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,3 @@ index 785db7edd43..c98941f5181 100644
import * as performance from 'vs/base/common/performance';
import type { MessagePortMain } from 'vs/base/parts/sandbox/node/electronTypes';
import { isCancellationError, isSigPipeError, onUnexpectedError } from 'vs/base/common/errors';
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,3 @@ index 45329df40c4..84119b7c042 100644

declare readonly _serviceBrand: undefined;

--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -1371,6 +1371,3 @@ index 80f5ee077cb..49abd845677 100644
description: nls.localize('contributes.semanticTokenModifiers.description', 'The description of the semantic token modifier')
}
}
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0023-fix-fix-dependency-injection.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,3 @@ index ef9ae6601ce..6182c4881a6 100644
}
}
}
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,3 @@ index b83a462131d..5ce2ec7413b 100644

// initialize API and register actors
const apiFactory = this._instaService.invokeFunction(createApiFactoryAndRegisterActors);
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,3 @@ index 20ec7e138a6..e284ed6752b 100644
-registerSingleton(ILogService, new SyncDescriptor(ExtHostLogService, [true], true));
registerSingleton(IExtHostExtensionService, ExtHostExtensionService, InstantiationType.Eager);
registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths, InstantiationType.Eager);
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0026-feat-expose-extHostExtensionService.patch
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,3 @@ index af014495458..b1c93afd65f 100644
private static _transform(initData: IExtensionHostInitData, rpcProtocol: RPCProtocol): IExtensionHostInitData {
initData.extensions.allExtensions.forEach((ext) => {
(<Mutable<IRelaxedExtensionDescription>>ext).extensionLocation = URI.revive(rpcProtocol.transformIncomingURIs(ext.extensionLocation));
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,3 @@ index c98941f5181..0ab601bdbfc 100644
// custom process.exit logic...
const nativeExit: IExitFn = process.exit.bind(process);
const nativeOn = process.on.bind(process);
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,3 @@ index 519924eec13..07dd94be9a2 100644
};
}

--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0029-feat-expose-api-factory.patch
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,3 @@ index 5ce2ec7413b..5555f431ba0 100644
await this._fakeModules.install();
performance.mark('code/extHost/didInitAPI');

--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -1911,6 +1911,3 @@ index 00000000000..2f31d6a7984
+ return obj instanceof FileEditorInput;
+ }
+});
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0031-fix-replace-map-by-forEach.patch
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,3 @@ index 67b7f28268f..342cc8a56c7 100644
}

isVisible(): boolean {
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,3 @@ index 8fab9bc5b71..30f20a45b2a 100644
+ collector.addRule(`.monaco-workbench-part { background-color: ${workbenchBackground}; }`);
}
});
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,3 @@ index 59bea5e74fc..5a8c9083989 100644

export interface IResourceExtension {
readonly identifier: IExtensionIdentifier;
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,3 @@ index a1a0779371e..18ca6d1b496 100644
this._scopeNameToLanguageRegistration[def.scopeName] = def;
}

--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0035-refactor-split-class-in-2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,3 @@ index 098be8e230d..0b12e5972ce 100644
+
+
+registerSingleton(IExtensionService, BrowserExtensionService, InstantiationType.Eager);
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,3 @@ index 2b1dc0a6b13..42e0d5788e9 100644
this._terminalHasBeenCreated = TerminalContextKeys.terminalHasBeenCreated.bindTo(this._contextKeyService);
this._terminalCountContextKey = TerminalContextKeys.count.bindTo(this._contextKeyService);
this._terminalEditorActive = TerminalContextKeys.terminalEditorActive.bindTo(this._contextKeyService);
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,3 @@ index 44c0c97a128..bd0c97c183a 100644
}

public mountTo(element: HTMLElement, targetWindow: CodeWindow) {
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,3 @@ index bd0c97c183a..9a4070e0d1c 100644
COI.addSearchParam(params, true, true);

const queryString = new URLSearchParams(params).toString();
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,3 @@ index 24764f1e31a..e16d9f5afcd 100644
}

export class WalkThroughSnippetContentProvider implements ITextModelContentProvider, IWorkbenchContribution {
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,3 @@ index 3ce96bba22a..d2067bf7445 100644
}, { window: mainWindow, disposables: this._store }));

return emitter.event;
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0041-fix-only-use-open-model.patch
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,3 @@ index f967fc38127..4da1da8f591 100644
this._modelOperations = new ModelOperations({
modelJsonLoaderFunc: async () => {
const response = await fetch(await this._host.fhr('getModelJsonUri', []));
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,3 @@ index 21312c7e76c..1f89122e0df 100644

// If we are in no-workspace or single-folder workspace, adding folders has to
// enter a workspace.
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,3 @@ index a77c2db9446..2b9a8c19926 100644
}

protected override shouldFlushWhenIdle(): boolean {
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,3 @@ index cbc07dc7fb0..455bb043b5d 100644
// Register Listeners
this.registerListeners(lifecycleService, storageService, configurationService, hostService, dialogService);

--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,3 @@ index f2f9ca95996..f5c28ec0cab 100644
return { module, error: undefined };
} catch (e) {
return { module: undefined, error: e };
--
2.34.1

3 changes: 0 additions & 3 deletions vscode-paches/0046-cleanup-remove-graceful-fs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,3 @@ index 180aa7e2960..d589be25ed6 100644
export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider implements
IFileSystemProviderWithFileReadWriteCapability,
IFileSystemProviderWithOpenReadWriteCloseCapability,
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,3 @@ index ff3661e3472..00b509d1b41 100644
const key = typeof data === 'object' ? data.key : data;
const message = (translations[path] ?? {})[key] ?? defaultMessage;
return {
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,3 @@ index 19b81cf9659..fce5c1d4eb4 100644
openCommandActionDescriptor: {
id: TerminalCommandId.Toggle,
mnemonicTitle: nls.localize({ key: 'miToggleIntegratedTerminal', comment: ['&& denotes a mnemonic'] }, "&&Terminal"),
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,3 @@ index ae62d18f2d0..5bf6ad46471 100644
-});
-
registerSingleton(IWalkthroughsService, WalkthroughsService, InstantiationType.Delayed);
--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,3 @@ index 351f7cc5cda..af1c305bac3 100644

//#endregion

--
2.34.1

Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,3 @@ index 00000000000..eaaaa2b3cbe
+}
+
+registerSingleton(IExtensionStatusBarItemService, ExtensionStatusBarItemService, InstantiationType.Delayed);
--
2.34.1

0 comments on commit 9243ee5

Please sign in to comment.