Merge pull request #366 from CodinGame/improve-patch-management

Improve patch management
CodinGame · Mar 12, 2024 · 0cf636c · 0cf636c
2 parents 43b96ae + 5589543
commit 0cf636c
Show file tree

Hide file tree

Showing 67 changed files with 7,344 additions and 6,398 deletions.
diff --git a/demo/src/features/customView.views.ts b/demo/src/features/customView.views.ts
@@ -6,7 +6,6 @@ registerCustomView({
   id: 'custom-view',
   name: 'Custom demo view',
   order: 0,
-  default: true,
   renderBody: function (container: HTMLElement): monaco.IDisposable {
     container.style.display = 'flex'
     container.style.alignItems = 'center'

diff --git a/demo/src/features/customView.workbench.ts b/demo/src/features/customView.workbench.ts
@@ -6,7 +6,6 @@ registerCustomView({
   id: 'custom-view',
   name: 'Custom demo view',
   order: 0,
-  default: true,
   renderBody: function (container: HTMLElement): monaco.IDisposable {
     container.style.display = 'flex'
     container.style.alignItems = 'center'

diff --git a/demo/src/setup.common.ts b/demo/src/setup.common.ts
@@ -237,7 +237,10 @@ export const constructOptions: IWorkbenchConstructionOptions = {
         orientation: 0,
         groups: [{ size: 1 }, { size: 1 }]
       }
-    }
+    },
+    views: [{
+      id: 'custom-view'
+    }]
   },
   welcomeBanner: {
     message: 'Welcome in monaco-vscode-api demo'

diff --git a/demo/src/setup.views.ts b/demo/src/setup.views.ts
@@ -14,6 +14,7 @@ import getViewsServiceOverride, {
   Position
 } from '@codingame/monaco-vscode-views-service-override'
 import { openNewCodeEditor } from './features/editor'
+import './features/customView.views'
 import { commonServices, constructOptions, remoteAuthority, userDataProvider } from './setup.common'
 
 const container = document.createElement('div')

diff --git a/demo/src/setup.workbench.ts b/demo/src/setup.workbench.ts
@@ -4,6 +4,7 @@ import getQuickAccessServiceOverride from '@codingame/monaco-vscode-quickaccess-
 import { BrowserStorageService } from '@codingame/monaco-vscode-storage-service-override'
 import { ExtensionHostKind } from '@codingame/monaco-vscode-extensions-service-override'
 import { registerExtension } from 'vscode/extensions'
+import './features/customView.workbench'
 import { commonServices, constructOptions, remoteAuthority, userDataProvider } from './setup.common'
 
 const container = document.createElement('div')

diff --git a/docs/vscode_monaco_upgrade.md b/docs/vscode_monaco_upgrade.md
@@ -8,12 +8,11 @@
 
 - Get The tag of the VSCode version from the [VSCode github](https://github.com/microsoft/vscode/tags)
 - Go to the VSCode repo directory, reset to the previous VSCode tag (`config.vscode.ref` from monaco-vscode-api `package.json`)
-- Apply the current patch: `patch -p1 < ../monaco-vscode-api/scripts/vscode.patch`
-- `git stash`
-- Checkout new VSCode tag
-- `git stash pop`
+- Apply the current patch: `git am ../monaco-vscode-api/vscode-paches/*.patch`
+- 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: `git diff --staged > ../monaco-vscode-api/scripts/vscode.patch`
+- Generate new patch: `rm -rf ../monaco-vscode-api/vscode-paches && git format-patch <tag>.. -o '../monaco-vscode-api/vscode-paches'`
 
 ## monaco-vscode-api repository
 

diff --git a/scripts/install-vscode b/scripts/install-vscode
@@ -7,7 +7,7 @@ output_directory="`pwd`/vscode"
 loc_output_directory="`pwd`/vscode-loc"
 extension_output_directory="`pwd`/vscode-default-extensions"
 extension_node_output_directory="`pwd`/vscode-default-extensions-node"
-patch_file="`pwd`/scripts/vscode.patch"
+patch_directory="`pwd`/vscode-paches"
 version_info=$output_directory/version.info
 
 if [[ -e $version_info && $(cat $version_info) == $vscodeRef ]]; then
@@ -34,7 +34,7 @@ yarn install --ignore-scripts
 yarn postinstall || true
 
 echo "Patching vscode..."
-patch -p1 < $patch_file
+find "$patch_directory" -type f -name '*.patch' -print0 | sort -z | xargs -t -0 -n 1 patch -p1 -i
 
 echo "Installing build dependencies"
 cd build