Merge pull request #331 from CodinGame/few-minor-fixes

Few minor fixes
CodinGame · Jan 29, 2024 · 9f6556d · 9f6556d
2 parents 393d136 + 644d704
commit 9f6556d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/rollup/rollup.config.ts b/rollup/rollup.config.ts
@@ -112,7 +112,8 @@ const SHARED_ROOT_FILES_BETWEEN_PACKAGES = ['services.js', 'extensions.js', 'mon
  */
 const EDITOR_API_EXPOSE_MODULES = [
   // use by monaco-vim
-  'vs/editor/common/commands/shiftCommand.js'
+  'vs/editor/common/commands/shiftCommand.js',
+  'vs/editor/browser/config/tabFocus.js'
 ]
 
 const EXTENSIONS = ['', '.ts', '.js']
@@ -1034,11 +1035,11 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
                     source: JSON.stringify(packageJson, null, 2),
                     type: 'asset'
                   })
-                  for (const path of EDITOR_API_EXPOSE_MODULES) {
+                  for (const modulePath of EDITOR_API_EXPOSE_MODULES) {
                     this.emitFile({
-                      fileName: `esm/${path}`,
+                      fileName: `esm/${modulePath}`,
                       needsCodeReference: false,
-                      source: `export * from 'vscode/vscode/${path}'`,
+                      source: `export * from 'vscode/vscode/${modulePath.slice(0, -path.extname(modulePath).length)}'`,
                       type: 'asset'
                     })
                   }

diff --git a/scripts/vscode.patch b/scripts/vscode.patch
@@ -4123,6 +4123,25 @@ index a466cc1f3a1..09f6a40eb26 100644
 
  	declare readonly _serviceBrand: undefined;
 
+diff --git a/src/vs/workbench/services/search/common/queryBuilder.ts b/src/vs/workbench/services/search/common/queryBuilder.ts
+index 78b4d0c9227..e6fadfd11d8 100644
+--- a/src/vs/workbench/services/search/common/queryBuilder.ts
++++ b/src/vs/workbench/services/search/common/queryBuilder.ts
+@@ -543,10 +543,10 @@ export class QueryBuilder {
+ 			folderName: includeFolderName ? folderName : undefined,
+ 			excludePattern: Object.keys(excludePattern).length > 0 ? excludePattern : undefined,
+ 			fileEncoding: folderConfig.files && folderConfig.files.encoding,
+-			disregardIgnoreFiles: typeof options.disregardIgnoreFiles === 'boolean' ? options.disregardIgnoreFiles : !folderConfig.search.useIgnoreFiles,
+-			disregardGlobalIgnoreFiles: typeof options.disregardGlobalIgnoreFiles === 'boolean' ? options.disregardGlobalIgnoreFiles : !folderConfig.search.useGlobalIgnoreFiles,
+-			disregardParentIgnoreFiles: typeof options.disregardParentIgnoreFiles === 'boolean' ? options.disregardParentIgnoreFiles : !folderConfig.search.useParentIgnoreFiles,
+-			ignoreSymlinks: typeof options.ignoreSymlinks === 'boolean' ? options.ignoreSymlinks : !folderConfig.search.followSymlinks,
++			disregardIgnoreFiles: typeof options.disregardIgnoreFiles === 'boolean' ? options.disregardIgnoreFiles : !folderConfig.search?.useIgnoreFiles,
++			disregardGlobalIgnoreFiles: typeof options.disregardGlobalIgnoreFiles === 'boolean' ? options.disregardGlobalIgnoreFiles : !folderConfig.search?.useGlobalIgnoreFiles,
++			disregardParentIgnoreFiles: typeof options.disregardParentIgnoreFiles === 'boolean' ? options.disregardParentIgnoreFiles : !folderConfig.search?.useParentIgnoreFiles,
++			ignoreSymlinks: typeof options.ignoreSymlinks === 'boolean' ? options.ignoreSymlinks : !folderConfig.search?.followSymlinks,
+ 		};
+ 	}
+ }
 diff --git a/src/vs/workbench/services/storage/browser/storageService.ts b/src/vs/workbench/services/storage/browser/storageService.ts
 index a77c2db9446..2b9a8c19926 100644
 --- a/src/vs/workbench/services/storage/browser/storageService.ts

diff --git a/src/service-override/quickaccess.ts b/src/service-override/quickaccess.ts
@@ -34,7 +34,7 @@ CommandsQuickAccessProvider.prototype['getCommandPicks'] = async function (this:
   if (!isKeybindingConfigurationVisible()) {
     result = result.map(picks => ({
       ...picks,
-      buttons: picks.buttons?.filter(button => button.tooltip !== 'Configure Keybinding')
+      buttons: undefined
     }))
   }
   return result