Etusivu Tutki Apua
Kirjaudu sisään
mirrors
/
vscodium
peilaus alkaen https://github.com/VSCodium/vscodium
2
0
Haarauta 0
Tiedostot Esitykset 0 Wiki
Puu: 895ada1ac1
Haarat Tunnisteet
vscodium
/
patches
/
disable-copilot.patch

disable-copilot.patch 7.9 KB
Historia Raaka

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118 
  1. diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
    2. 

  2. index 43eea51..4ce6918 100644
    3. 

  3. --- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
    4. 

  4. +++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
    5. 

  5. @@ -181,3 +181,4 @@ abstract class OpenChatGlobalAction extends Action2 {
    6. 

  6.  				ChatContextKeys.Setup.hidden.negate(),
    7. 

  7. -				ChatContextKeys.Setup.disabled.negate()
    8. 

  8. +				ChatContextKeys.Setup.disabled.negate(),
    9. 

  9. +				ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    10. 

  10.  			)
    11. 

  11. @@ -1395,3 +1396,3 @@ export function registerChatActions() {
    12. 

  12.  				precondition: ContextKeyExpr.and(
    13. 

  13. -					ChatContextKeys.Setup.installed,
    14. 

  14. +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    15. 

  15.  					ChatContextKeys.Setup.disabled.negate(),
    16. 

  16. @@ -1608,3 +1609,4 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
    17. 

  17.  			ChatContextKeys.Setup.hidden.negate(),
    18. 

  18. -			ChatContextKeys.Setup.disabled.negate()
    19. 

  19. +			ChatContextKeys.Setup.disabled.negate(),
    20. 

  20. +			ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    21. 

  21.  		),
    22. 

  22. @@ -1625,3 +1627,4 @@ MenuRegistry.appendMenuItem(MenuId.TitleBar, {
    23. 

  23.  			ChatContextKeys.Setup.hidden.negate(),
    24. 

  24. -			ChatContextKeys.Setup.disabled.negate()
    25. 

  25. +			ChatContextKeys.Setup.disabled.negate(),
    26. 

  26. +			ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    27. 

  27.  		),
    28. 

  28. @@ -1642,3 +1645,4 @@ registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction {
    29. 

  29.  					ChatContextKeys.Setup.hidden.negate(),
    30. 

  30. -					ChatContextKeys.Setup.disabled.negate()
    31. 

  31. +					ChatContextKeys.Setup.disabled.negate(),
    32. 

  32. +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    33. 

  33.  				),
    34. 

  34. @@ -1779,3 +1783,4 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
    35. 

  35.  		ChatContextKeys.Setup.hidden.negate(),
    36. 

  36. -		ChatContextKeys.Setup.disabled.negate()
    37. 

  37. +		ChatContextKeys.Setup.disabled.negate(),
    38. 

  38. +		ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
    39. 

  39.  	)
    40. 

  40. diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
    41. 

  41. index ee0b4a4..c6243b8 100644
    42. 

  42. --- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
    43. 

  43. +++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
    44. 

  44. @@ -187,3 +187,3 @@ configurationRegistry.registerConfiguration({
    45. 

  45.  			markdownDescription: nls.localize('chat.commandCenter.enabled', "Controls whether the command center shows a menu for actions to control chat (requires {0}).", '`#window.commandCenter#`'),
    46. 

  46. -			default: true
    47. 

  47. +			default: false
    48. 

  48.  		},
    49. 

  49. @@ -801,3 +801,3 @@ configurationRegistry.registerConfiguration({
    50. 

  50.  			description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."),
    51. 

  51. -			default: false,
    52. 

  52. +			default: true,
    53. 

  53.  			scope: ConfigurationScope.WINDOW
    54. 

  54. diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
    55. 

  55. index 9573667..f71e066 100644
    56. 

  56. --- a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
    57. 

  57. +++ b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
    58. 

  58. @@ -67,10 +67,9 @@ const chatViewDescriptor: IViewDescriptor = {
    59. 

  59.  	ctorDescriptor: new SyncDescriptor(ChatViewPane),
    60. 

  60. -	when: ContextKeyExpr.or(
    61. 

  61. -		ContextKeyExpr.or(
    62. 

  62. -			ChatContextKeys.Setup.hidden,
    63. 

  63. -			ChatContextKeys.Setup.disabled
    64. 

  64. -		)?.negate(),
    65. 

  65. -		ChatContextKeys.panelParticipantRegistered,
    66. 

  66. -		ChatContextKeys.extensionInvalid
    67. 

  67. -	)
    68. 

  68. +	when: ContextKeyExpr.and(
    69. 

  69. +		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    70. 

  70. +		ChatContextKeys.Setup.disabled.negate(),
    71. 

  71. +		ChatContextKeys.Setup.hidden.negate(),
    72. 

  72. + 		ChatContextKeys.panelParticipantRegistered,
    73. 

  73. +		ChatContextKeys.extensionInvalid.negate()
    74. 

  74. + 	)
    75. 

  75.  };
    76. 

  76. diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
    77. 

  77. index 09aef7e..daf6437 100644
    78. 

  78. --- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
    79. 

  79. +++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
    80. 

  80. @@ -113,4 +113,4 @@ export namespace ChatContextKeyExprs {
    81. 

  81.  	 */
    82. 

  82. -	export const chatSetupTriggerContext = ContextKeyExpr.or(
    83. 

  83. -		ChatContextKeys.Setup.installed.negate(),
    84. 

  84. +	export const chatSetupTriggerContext = ContextKeyExpr.and(
    85. 

  85. +		ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    86. 

  86.  		ChatContextKeys.Entitlement.canSignUp
    87. 

  87. diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
    88. 

  88. index d8ddc37..f48fd86 100644
    89. 

  89. --- a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
    90. 

  90. +++ b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
    91. 

  91. @@ -540,3 +540,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
    92. 

  92.  				ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{}]),
    93. 

  93. -				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
    94. 

  94. +				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
    95. 

  95.  				weight: 40,
    96. 

  96. @@ -555,3 +555,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
    97. 

  97.  				ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{ showWelcome: true }]),
    98. 

  98. -				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
    99. 

  99. +				when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
    100. 

  100.  				weight: 40,
    101. 

  101. diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
    102. 

  102. index fe12782..06b1b76 100644
    103. 

  103. --- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
    104. 

  104. +++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
    105. 

  105. @@ -685,3 +685,3 @@ registerAction2(class extends Action2 {
    106. 

  106.  					ChatContextKeys.Setup.disabled.negate(),
    107. 

  107. -					ChatContextKeys.Setup.installed.negate(),
    108. 

  108. +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    109. 

  109.  					ContextKeyExpr.in(ResourceContextKey.Resource.key, 'git.mergeChanges'),
    110. 

  110. diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
    111. 

  111. index 4260a28..6ac55b6 100644
    112. 

  112. --- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
    113. 

  113. +++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
    114. 

  114. @@ -1383,3 +1383,3 @@ registerAction2(class extends Action2 {
    115. 

  115.  					ChatContextKeys.Setup.disabled.negate(),
    116. 

  116. -					ChatContextKeys.Setup.installed.negate(),
    117. 

  117. +					ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
    118. 

  118.  					ContextKeyExpr.equals('scmProvider', 'git')
    119.