${this.escapeHtml(content)}
`; - } - } - - private preprocessContent(content: string): string { - return content - // 1. LaTeX Math Notation (normalize different formats) - No change needed - .replace(/\\\[([\s\S]*?)\\\]/g, (_, equation) => `$$${equation}$$`) - .replace(/\\\(([\s\S]*?)\\\)/g, (_, equation) => `$${equation}$`) - - // 2. Handle Code Block Language Tags (allow hyphens) - .replace(/```([a-zA-Z0-9-]+)\s*\n/g, '```$1\n') - - // 3. Fix Common Escape Issues (use with caution) - No change, but be aware of its behavior - .replace(/\\`/g, '`') - .replace(/\\\*/g, '*') - .replace(/\\_/g, '_') - - // 4. Normalize Line Endings - No change needed - .replace(/\r\n/g, '\n') - .replace(/\r/g, '\n') - - // 5. Handle Triple Quotes - No change needed - .replace(/"""\s*(\w+)?\s*\n([\s\S]*?)\n"""/g, (match, lang, code) => { - return lang ? `\`\`\`${lang}\n${code}\n\`\`\`` : `\`\`\`\n${code}\n\`\`\``; - }) - - // 6. Clean up Multiple Consecutive Newlines (collapse to a standard paragraph break) - .replace(/\n{3,}/g, '\n\n') - - // 7. Handle Gemini's math-in-code-blocks tendency - No change needed - .replace(/```math\n([\s\S]*?)\n```/g, (_, equation) => { - if (equation.includes('\\') || equation.includes('{') || equation.includes('^') || equation.includes('_')) { - return `$$${equation}$$`; - } - return `\`\`\`\n${equation}\n\`\`\``; - }) - - // 8. Fix Bold/Italic Formatting Issues - No change needed - .replace(/\*\*\s+([^*]+)\s+\*\*/g, '**$1**') - .replace(/\*\s+([^*]+)\s+\*/g, '*$1*') - - // 9. Fix Table Formatting Issues - No change needed - .replace(/^\|\s+/gm, '| ') - .replace(/\s+\|$/gm, ' |') - - // 10. Handle Alternative List Markers - No change needed - .replace(/^•\s/gm, '- ') - .replace(/^→\s/gm, '- ') - - // 11. Fix Link Formatting Issues - No change needed - .replace(/\[\s+([^\]]+)\s+\]/g, '[$1]') - - // 12. Handle Footnote Variations (remove optional spaces) - .replace(/\[\^(\w+)\]\s*:/g, '[^$1]:') - - // 13. Clean up Heading Formatting - No change needed - .replace(/^#+\s+/gm, (match) => match.replace(/\s+/g, ' ')); - } - - private escapeHtml(text: string): string { - const div = document.createElement('div'); - div.textContent = text; - return div.innerHTML; - } -} \ No newline at end of file diff --git a/Services/ServiceRegistration.ts b/Services/ServiceRegistration.ts index e88e7ec..b39be3e 100644 --- a/Services/ServiceRegistration.ts +++ b/Services/ServiceRegistration.ts @@ -10,8 +10,7 @@ import type { IActioner } from "Actioner/IActioner"; import type { IAIClass } from "AIClasses/IAIClass"; import { GeminiActionDefinitions } from "Actioner/Gemini/GeminiActionDefinitions"; import type { IActionDefinitions } from "Actioner/IActionDefinitions"; -import { Gemini, type IAIClassStreaming } from "AIClasses/Gemini/Gemini"; -import { MarkdownService } from "./MarkdownService"; +import { Gemini } from "AIClasses/Gemini/Gemini"; import { StreamingMarkdownService } from "./StreamingMarkdownService"; export function RegisterDependencies(plugin: DmsAssistantPlugin) { @@ -22,10 +21,8 @@ export function RegisterDependencies(plugin: DmsAssistantPlugin) { RegisterSingleton');
+ inCodeBlock = true;
+ }
+ continue;
+ }
+
+ if (inCodeBlock) {
+ html.push(line + '\n');
+ continue;
+ }
+
+ // Basic list support
+ if (/^[*+-]\s/.test(line)) {
+ if (!inList) {
+ html.push('');
+ inList = true;
+ }
+ html.push(`- ${line.substring(2)}
`);
+ } else if (inList && line.trim() === '') {
+ html.push('
');
+ inList = false;
+ } else {
+ if (inList) {
+ html.push('');
+ inList = false;
+ }
+
+ // Basic formatting
+ const formatted = line
+ .replace(/\*\*(.+?)\*\*/g, '$1')
+ .replace(/\*(.+?)\*/g, '$1')
+ .replace(/`(.+?)`/g, '$1');
+
+ if (line.trim()) {
+ html.push(`${formatted}
`);
+ }
+ }
+ }
+
+ if (inList) html.push('');
+ if (inCodeBlock) html.push('