Merge pull request #101 from TrueNine/devz

Dev

Author: TrueNine

Cargo.lock

@@ -433,6 +433,10 @@ export function collectProtectedInputSourceRules(
     addRuleFromDir(config.dir as DirPathLike | undefined, 'direct', 'vscode input config file', 'collected-input-config')
   }
 
+  for (const config of collectedOutputContext.zedConfigFiles ?? []) {
+    addRuleFromDir(config.dir as DirPathLike | undefined, 'direct', 'zed input config file', 'collected-input-config')
+  }
+
   for (const config of collectedOutputContext.jetbrainsConfigFiles ?? []) {
     addRuleFromDir(config.dir as DirPathLike | undefined, 'direct', 'jetbrains input config file', 'collected-input-config')
   }

cli/src/ProtectedDeletionGuard.ts

@@ -15,11 +15,11 @@ import type {
   WindowsOptions
 } from './plugins/plugin-core'
 import * as path from 'node:path'
+import {createLogger} from '@truenine/logger'
 import {checkVersionControl} from './Aindex'
 import {getConfigLoader} from './ConfigLoader'
 import {collectInputContext, resolveRuntimeCommand} from './inputs/runtime'
 import {
-  createLogger,
   FilePathKind,
   PathPlaceholders,
   toOutputCollectedContext,
@@ -120,9 +120,10 @@ export interface DefineConfigOptions {
 export function mergeConfig(
   ...configs: Partial<PluginOptions>[]
 ): Required<PluginOptions> {
-  return configs.reduce<Required<PluginOptions>>(
-    (acc, config) => mergeTwoConfigs(acc, config),
-    {...DEFAULT_OPTIONS}
+  const initialConfig: Required<PluginOptions> = {...DEFAULT_OPTIONS}
+  return configs.reduce(
+    (acc: Required<PluginOptions>, config) => mergeTwoConfigs(acc, config),
+    initialConfig
   )
 }
 
@@ -477,6 +478,7 @@ export async function defineConfig(options: PluginOptions | DefineConfigOptions
   const inputContext: InputCollectedContext = {
     workspace: merged.workspace,
     ...merged.vscodeConfigFiles != null && {vscodeConfigFiles: merged.vscodeConfigFiles},
+    ...merged.zedConfigFiles != null && {zedConfigFiles: merged.zedConfigFiles},
     ...merged.jetbrainsConfigFiles != null && {jetbrainsConfigFiles: merged.jetbrainsConfigFiles},
     ...merged.editorConfigFiles != null && {editorConfigFiles: merged.editorConfigFiles},
     ...merged.commands != null && {commands: merged.commands},

cli/src/config.ts

@@ -54,3 +54,6 @@ export {
 export {
   WorkspaceInputCapability
 } from './input-workspace' // Regular Input Plugins
+export {
+  ZedConfigInputCapability
+} from './input-zed-config'