Merge branch 'main' of https://github.com/QwenLM/qwen-code into feat/support-lsp

This commit is contained in:
yiliang114 2026-01-26 23:13:53 +08:00
commit 0bff045d3d
68 changed files with 2444 additions and 592 deletions

View file

@ -961,7 +961,7 @@ export async function loadCliConfig(
targetDir: cwd,
includeDirectories,
loadMemoryFromIncludeDirectories:
settings.context?.loadMemoryFromIncludeDirectories || false,
settings.context?.loadFromIncludeDirectories || false,
importFormat: settings.context?.importFormat || 'tree',
debugMode,
question,

View file

@ -218,14 +218,14 @@ describe('SettingsSchema', () => {
},
context: {
includeDirectories: ['/path/to/dir'],
loadMemoryFromIncludeDirectories: true,
loadFromIncludeDirectories: true,
},
};
// TypeScript should not complain about these properties
expect(settings.ui?.theme).toBe('dark');
expect(settings.context?.includeDirectories).toEqual(['/path/to/dir']);
expect(settings.context?.loadMemoryFromIncludeDirectories).toBe(true);
expect(settings.context?.loadFromIncludeDirectories).toBe(true);
});
it('should have includeDirectories setting in schema', () => {
@ -243,21 +243,19 @@ describe('SettingsSchema', () => {
).toEqual([]);
});
it('should have loadMemoryFromIncludeDirectories setting in schema', () => {
it('should have loadFromIncludeDirectories setting in schema', () => {
expect(
getSettingsSchema().context?.properties
.loadMemoryFromIncludeDirectories,
getSettingsSchema().context?.properties.loadFromIncludeDirectories,
).toBeDefined();
expect(
getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories
.type,
getSettingsSchema().context?.properties.loadFromIncludeDirectories.type,
).toBe('boolean');
expect(
getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories
getSettingsSchema().context?.properties.loadFromIncludeDirectories
.category,
).toBe('Context');
expect(
getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories
getSettingsSchema().context?.properties.loadFromIncludeDirectories
.default,
).toBe(false);
});

View file

@ -687,7 +687,7 @@ const SETTINGS_SCHEMA = {
showInDialog: false,
mergeStrategy: MergeStrategy.CONCAT,
},
loadMemoryFromIncludeDirectories: {
loadFromIncludeDirectories: {
type: 'boolean',
label: 'Load Memory From Include Directories',
category: 'Context',