feat(editor): enable file-backed Monaco models and add Problems panel; lazy-init project TypeScript IntelliSense
This commit is contained in:
BIN
.playwright-mcp/intellisense-test.png
Normal file
BIN
.playwright-mcp/intellisense-test.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 66 KiB |
BIN
.playwright-mcp/workspace-full.png
Normal file
BIN
.playwright-mcp/workspace-full.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 69 KiB |
BIN
.playwright-mcp/workspace-with-problems-panel.png
Normal file
BIN
.playwright-mcp/workspace-with-problems-panel.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 69 KiB |
@@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2025-12-30 - 3.15.0 - feat(editor)
|
||||||
|
enable file-backed Monaco models and add Problems panel; lazy-init project TypeScript IntelliSense
|
||||||
|
|
||||||
|
- dees-editor-monaco: add `filePath` property and create/get Monaco models with file:// URIs so editors are backed by real models; sync content into models and handle model switching when filePath changes; enable hover config and improved lifecycle handling.
|
||||||
|
- dees-editor-workspace: add bottom 'Problems' panel and panel tabs (terminal/problems), diagnosticMarkers state, marker listener, UI for problem list, and navigation to file/position when a problem is clicked; initialize IntelliSense lazily when a file is opened.
|
||||||
|
- typescript-intellisense: index project .ts/.js files from the virtual filesystem into Monaco models for cross-file resolution, enable allowNonTsExtensions and set eager model sync so TypeScript processes models eagerly.
|
||||||
|
- General: improved handling for language changes, model language switching, and deferred initialization of the IntelliSense manager.
|
||||||
|
- Add Playwright test images (workspace screenshots) used by CI/tests.
|
||||||
|
|
||||||
## 2025-12-30 - 3.14.2 - fix(editor)
|
## 2025-12-30 - 3.14.2 - fix(editor)
|
||||||
bump monaco-editor to 0.55.1 and adapt TypeScript intellisense integration to the updated Monaco API
|
bump monaco-editor to 0.55.1 and adapt TypeScript intellisense integration to the updated Monaco API
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@design.estate/dees-catalog',
|
name: '@design.estate/dees-catalog',
|
||||||
version: '3.14.2',
|
version: '3.15.0',
|
||||||
description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
|
description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,11 @@ export class DeesEditorMonaco extends DeesElement {
|
|||||||
})
|
})
|
||||||
accessor language = 'typescript';
|
accessor language = 'typescript';
|
||||||
|
|
||||||
|
@property({
|
||||||
|
type: String
|
||||||
|
})
|
||||||
|
accessor filePath: string = '';
|
||||||
|
|
||||||
@property({
|
@property({
|
||||||
type: Object
|
type: Object
|
||||||
})
|
})
|
||||||
@@ -114,14 +119,35 @@ export class DeesEditorMonaco extends DeesElement {
|
|||||||
const isBright = domtoolsInstance.themeManager.goBrightBoolean;
|
const isBright = domtoolsInstance.themeManager.goBrightBoolean;
|
||||||
const initialTheme = isBright ? 'vs' : 'vs-dark';
|
const initialTheme = isBright ? 'vs' : 'vs-dark';
|
||||||
|
|
||||||
const editor = ((window as any).monaco.editor as typeof monaco.editor).create(container, {
|
const monacoInstance = (window as any).monaco as typeof monaco;
|
||||||
value: this.content,
|
|
||||||
language: this.language,
|
// Create or get model with proper file URI for TypeScript IntelliSense
|
||||||
|
let model: monaco.editor.ITextModel | null = null;
|
||||||
|
if (this.filePath) {
|
||||||
|
const uri = monacoInstance.Uri.parse(`file://${this.filePath}`);
|
||||||
|
model = monacoInstance.editor.getModel(uri);
|
||||||
|
if (!model) {
|
||||||
|
model = monacoInstance.editor.createModel(this.content, this.language, uri);
|
||||||
|
} else {
|
||||||
|
model.setValue(this.content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const editor = (monacoInstance.editor as typeof monaco.editor).create(container, {
|
||||||
|
model: model || undefined,
|
||||||
|
value: model ? undefined : this.content,
|
||||||
|
language: model ? undefined : this.language,
|
||||||
theme: initialTheme,
|
theme: initialTheme,
|
||||||
useShadowDOM: true,
|
useShadowDOM: true,
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
automaticLayout: true,
|
automaticLayout: true,
|
||||||
wordWrap: this.wordWrap
|
wordWrap: this.wordWrap,
|
||||||
|
hover: {
|
||||||
|
enabled: true,
|
||||||
|
delay: 300,
|
||||||
|
sticky: true,
|
||||||
|
above: false,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// Subscribe to theme changes
|
// Subscribe to theme changes
|
||||||
@@ -160,7 +186,35 @@ export class DeesEditorMonaco extends DeesElement {
|
|||||||
public async updated(changedProperties: Map<string, any>): Promise<void> {
|
public async updated(changedProperties: Map<string, any>): Promise<void> {
|
||||||
super.updated(changedProperties);
|
super.updated(changedProperties);
|
||||||
|
|
||||||
// Handle content changes
|
const monacoInstance = (window as any).monaco as typeof monaco;
|
||||||
|
if (!monacoInstance) return;
|
||||||
|
|
||||||
|
// Handle filePath changes - switch to different model
|
||||||
|
if (changedProperties.has('filePath') && this.filePath) {
|
||||||
|
const editor = await this.editorDeferred.promise;
|
||||||
|
const uri = monacoInstance.Uri.parse(`file://${this.filePath}`);
|
||||||
|
let model = monacoInstance.editor.getModel(uri);
|
||||||
|
|
||||||
|
if (!model) {
|
||||||
|
model = monacoInstance.editor.createModel(this.content, this.language, uri);
|
||||||
|
} else {
|
||||||
|
// Update model content if different
|
||||||
|
if (model.getValue() !== this.content) {
|
||||||
|
this.isUpdatingFromExternal = true;
|
||||||
|
model.setValue(this.content);
|
||||||
|
this.isUpdatingFromExternal = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Switch editor to use this model
|
||||||
|
const currentModel = editor.getModel();
|
||||||
|
if (currentModel?.uri.toString() !== uri.toString()) {
|
||||||
|
editor.setModel(model);
|
||||||
|
}
|
||||||
|
return; // filePath change handles content too
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle content changes (when no filePath or filePath unchanged)
|
||||||
if (changedProperties.has('content')) {
|
if (changedProperties.has('content')) {
|
||||||
const editor = await this.editorDeferred.promise;
|
const editor = await this.editorDeferred.promise;
|
||||||
const currentValue = editor.getValue();
|
const currentValue = editor.getValue();
|
||||||
@@ -176,10 +230,7 @@ export class DeesEditorMonaco extends DeesElement {
|
|||||||
const editor = await this.editorDeferred.promise;
|
const editor = await this.editorDeferred.promise;
|
||||||
const model = editor.getModel();
|
const model = editor.getModel();
|
||||||
if (model) {
|
if (model) {
|
||||||
const monacoInstance = (window as any).monaco;
|
monacoInstance.editor.setModelLanguage(model, this.language);
|
||||||
if (monacoInstance) {
|
|
||||||
monacoInstance.editor.setModelLanguage(model, this.language);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -178,9 +178,25 @@ export function createUser(firstName: string, lastName: string): IUser {
|
|||||||
@state()
|
@state()
|
||||||
accessor isInitializing: boolean = true;
|
accessor isInitializing: boolean = true;
|
||||||
|
|
||||||
|
@state()
|
||||||
|
accessor activeBottomPanel: 'terminal' | 'problems' = 'terminal';
|
||||||
|
|
||||||
|
@state()
|
||||||
|
accessor diagnosticMarkers: Array<{
|
||||||
|
message: string;
|
||||||
|
severity: number;
|
||||||
|
startLineNumber: number;
|
||||||
|
startColumn: number;
|
||||||
|
endLineNumber: number;
|
||||||
|
endColumn: number;
|
||||||
|
source?: string;
|
||||||
|
resource: { path: string };
|
||||||
|
}> = [];
|
||||||
|
|
||||||
private editorElement: DeesEditorMonaco | null = null;
|
private editorElement: DeesEditorMonaco | null = null;
|
||||||
private initializationStarted: boolean = false;
|
private initializationStarted: boolean = false;
|
||||||
private intelliSenseManager: TypeScriptIntelliSenseManager | null = null;
|
private intelliSenseManager: TypeScriptIntelliSenseManager | null = null;
|
||||||
|
private intelliSenseInitialized: boolean = false;
|
||||||
|
|
||||||
public static styles = [
|
public static styles = [
|
||||||
themeDefaultStyles,
|
themeDefaultStyles,
|
||||||
@@ -387,6 +403,127 @@ export function createUser(firstName: string, lastName: string): IUser {
|
|||||||
bottom: 0;
|
bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.problems-content {
|
||||||
|
position: absolute;
|
||||||
|
top: 32px;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
overflow-y: auto;
|
||||||
|
background: ${cssManager.bdTheme('hsl(0 0% 100%)', 'hsl(0 0% 9%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel-tabs {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel-tab {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
padding: 0 12px;
|
||||||
|
height: 32px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 55%)')};
|
||||||
|
border-bottom: 2px solid transparent;
|
||||||
|
transition: all 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel-tab:hover {
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 75%)')};
|
||||||
|
background: ${cssManager.bdTheme('hsl(0 0% 90%)', 'hsl(0 0% 12%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel-tab.active {
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 0% 20%)', 'hsl(0 0% 90%)')};
|
||||||
|
border-bottom-color: ${cssManager.bdTheme('hsl(210 100% 50%)', 'hsl(210 100% 60%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel-tab-badge {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-width: 18px;
|
||||||
|
height: 18px;
|
||||||
|
padding: 0 5px;
|
||||||
|
border-radius: 9px;
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 600;
|
||||||
|
background: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 45%)')};
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel-tab-badge.warning {
|
||||||
|
background: ${cssManager.bdTheme('hsl(40 70% 50%)', 'hsl(40 70% 45%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel-tab-badge.none {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.problems-list {
|
||||||
|
padding: 4px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.problem-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 6px 12px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.4;
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 80%)')};
|
||||||
|
transition: background 0.1s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.problem-item:hover {
|
||||||
|
background: ${cssManager.bdTheme('hsl(0 0% 95%)', 'hsl(0 0% 15%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.problem-icon {
|
||||||
|
flex-shrink: 0;
|
||||||
|
margin-top: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.problem-icon.error {
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 60%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.problem-icon.warning {
|
||||||
|
color: ${cssManager.bdTheme('hsl(40 70% 50%)', 'hsl(40 70% 60%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.problem-details {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.problem-message {
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.problem-location {
|
||||||
|
margin-top: 2px;
|
||||||
|
font-size: 11px;
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 55%)')};
|
||||||
|
}
|
||||||
|
|
||||||
|
.problems-empty {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
height: 100%;
|
||||||
|
color: ${cssManager.bdTheme('hsl(0 0% 55%)', 'hsl(0 0% 50%)')};
|
||||||
|
font-size: 13px;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.empty-state {
|
.empty-state {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -495,6 +632,7 @@ export function createUser(firstName: string, lastName: string): IUser {
|
|||||||
</div>
|
</div>
|
||||||
` : html`
|
` : html`
|
||||||
<dees-editor-monaco
|
<dees-editor-monaco
|
||||||
|
.filePath=${this.activeFilePath}
|
||||||
.content=${this.getActiveFileContent()}
|
.content=${this.getActiveFileContent()}
|
||||||
.language=${this.getLanguageFromPath(this.activeFilePath)}
|
.language=${this.getLanguageFromPath(this.activeFilePath)}
|
||||||
@content-change=${this.handleContentChange}
|
@content-change=${this.handleContentChange}
|
||||||
@@ -509,9 +647,24 @@ export function createUser(firstName: string, lastName: string): IUser {
|
|||||||
style="height: ${this.isTerminalCollapsed ? 32 : this.terminalHeight}px"
|
style="height: ${this.isTerminalCollapsed ? 32 : this.terminalHeight}px"
|
||||||
>
|
>
|
||||||
<div class="panel-header">
|
<div class="panel-header">
|
||||||
<div class="panel-header-title">
|
<div class="panel-tabs">
|
||||||
<dees-icon .icon=${'lucide:terminal'} iconSize="14"></dees-icon>
|
<div
|
||||||
Terminal
|
class="panel-tab ${this.activeBottomPanel === 'terminal' ? 'active' : ''}"
|
||||||
|
@click=${() => this.activeBottomPanel = 'terminal'}
|
||||||
|
>
|
||||||
|
<dees-icon .icon=${'lucide:terminal'} iconSize="14"></dees-icon>
|
||||||
|
Terminal
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="panel-tab ${this.activeBottomPanel === 'problems' ? 'active' : ''}"
|
||||||
|
@click=${() => this.activeBottomPanel = 'problems'}
|
||||||
|
>
|
||||||
|
<dees-icon .icon=${'lucide:circleAlert'} iconSize="14"></dees-icon>
|
||||||
|
Problems
|
||||||
|
${this.diagnosticMarkers.length > 0 ? html`
|
||||||
|
<span class="panel-tab-badge ${this.getErrorCount() === 0 ? 'warning' : ''}">${this.diagnosticMarkers.length}</span>
|
||||||
|
` : ''}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-header-actions">
|
<div class="panel-header-actions">
|
||||||
<div class="panel-action" @click=${this.toggleTerminal}>
|
<div class="panel-action" @click=${this.toggleTerminal}>
|
||||||
@@ -522,12 +675,15 @@ export function createUser(firstName: string, lastName: string): IUser {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="terminal-content">
|
<div class="terminal-content" style="display: ${this.activeBottomPanel === 'terminal' ? 'block' : 'none'}">
|
||||||
<dees-terminal
|
<dees-terminal
|
||||||
.executionEnvironment=${this.executionEnvironment}
|
.executionEnvironment=${this.executionEnvironment}
|
||||||
.setupCommand=${''}
|
.setupCommand=${''}
|
||||||
></dees-terminal>
|
></dees-terminal>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="problems-content" style="display: ${this.activeBottomPanel === 'problems' ? 'block' : 'none'}">
|
||||||
|
${this.renderProblemsPanel()}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
` : ''}
|
` : ''}
|
||||||
</div>
|
</div>
|
||||||
@@ -562,8 +718,7 @@ export function createUser(firstName: string, lastName: string): IUser {
|
|||||||
} else if (!this.executionEnvironment.ready) {
|
} else if (!this.executionEnvironment.ready) {
|
||||||
await this.executionEnvironment.init();
|
await this.executionEnvironment.init();
|
||||||
}
|
}
|
||||||
// Initialize IntelliSense after workspace is ready
|
// IntelliSense is initialized lazily when first file is opened (Monaco loads on demand)
|
||||||
await this.initializeIntelliSense();
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to initialize workspace:', error);
|
console.error('Failed to initialize workspace:', error);
|
||||||
// Reset flag to allow retry
|
// Reset flag to allow retry
|
||||||
@@ -575,16 +730,27 @@ export function createUser(firstName: string, lastName: string): IUser {
|
|||||||
|
|
||||||
private async initializeIntelliSense(): Promise<void> {
|
private async initializeIntelliSense(): Promise<void> {
|
||||||
if (!this.executionEnvironment) return;
|
if (!this.executionEnvironment) return;
|
||||||
|
if (this.intelliSenseInitialized) return;
|
||||||
|
|
||||||
// Wait for Monaco to be available globally
|
// Wait for Monaco to be available globally (with retry for timing)
|
||||||
const monacoInstance = (window as any).monaco;
|
let monacoInstance = (window as any).monaco;
|
||||||
if (!monacoInstance) {
|
if (!monacoInstance) {
|
||||||
console.warn('Monaco not loaded, IntelliSense disabled');
|
// Monaco loads asynchronously when the editor mounts, wait a bit
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 100));
|
||||||
|
monacoInstance = (window as any).monaco;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!monacoInstance) {
|
||||||
|
console.warn('Monaco not yet loaded, IntelliSense will be initialized later');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.intelliSenseInitialized = true;
|
||||||
this.intelliSenseManager = new TypeScriptIntelliSenseManager();
|
this.intelliSenseManager = new TypeScriptIntelliSenseManager();
|
||||||
await this.intelliSenseManager.init(monacoInstance, this.executionEnvironment);
|
await this.intelliSenseManager.init(monacoInstance, this.executionEnvironment);
|
||||||
|
|
||||||
|
// Set up marker listener for Problems panel
|
||||||
|
this.setupMarkerListener();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async handleFileSelect(e: CustomEvent<{ path: string; name: string }>) {
|
private async handleFileSelect(e: CustomEvent<{ path: string; name: string }>) {
|
||||||
@@ -610,6 +776,21 @@ export function createUser(firstName: string, lastName: string): IUser {
|
|||||||
{ path, name, content, modified: false },
|
{ path, name, content, modified: false },
|
||||||
];
|
];
|
||||||
this.activeFilePath = path;
|
this.activeFilePath = path;
|
||||||
|
|
||||||
|
// Initialize IntelliSense lazily after first file opens (Monaco loads on demand)
|
||||||
|
if (!this.intelliSenseInitialized) {
|
||||||
|
// Wait for Monaco editor to mount and load Monaco from CDN
|
||||||
|
await this.updateComplete;
|
||||||
|
// Give Monaco time to load via require.js
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 500));
|
||||||
|
await this.initializeIntelliSense();
|
||||||
|
|
||||||
|
// Process the initial file content for IntelliSense
|
||||||
|
const language = this.getLanguageFromPath(path);
|
||||||
|
if (this.intelliSenseManager && (language === 'typescript' || language === 'javascript')) {
|
||||||
|
await this.intelliSenseManager.processContentChange(content);
|
||||||
|
}
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`Failed to open file ${path}:`, error);
|
console.error(`Failed to open file ${path}:`, error);
|
||||||
}
|
}
|
||||||
@@ -699,6 +880,103 @@ export function createUser(firstName: string, lastName: string): IUser {
|
|||||||
this.isTerminalCollapsed = !this.isTerminalCollapsed;
|
this.isTerminalCollapsed = !this.isTerminalCollapsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private getErrorCount(): number {
|
||||||
|
// Monaco MarkerSeverity: Error = 8, Warning = 4, Info = 2, Hint = 1
|
||||||
|
return this.diagnosticMarkers.filter(m => m.severity === 8).length;
|
||||||
|
}
|
||||||
|
|
||||||
|
private renderProblemsPanel(): TemplateResult {
|
||||||
|
if (this.diagnosticMarkers.length === 0) {
|
||||||
|
return html`
|
||||||
|
<div class="problems-empty">
|
||||||
|
<dees-icon .icon=${'lucide:checkCircle'} iconSize="24"></dees-icon>
|
||||||
|
<span>No problems detected</span>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<div class="problems-list">
|
||||||
|
${this.diagnosticMarkers.map(marker => html`
|
||||||
|
<div class="problem-item" @click=${() => this.navigateToProblem(marker)}>
|
||||||
|
<dees-icon
|
||||||
|
class="problem-icon ${marker.severity === 8 ? 'error' : 'warning'}"
|
||||||
|
.icon=${marker.severity === 8 ? 'lucide:circleX' : 'lucide:triangleAlert'}
|
||||||
|
iconSize="14"
|
||||||
|
></dees-icon>
|
||||||
|
<div class="problem-details">
|
||||||
|
<div class="problem-message">${marker.message}</div>
|
||||||
|
<div class="problem-location">
|
||||||
|
${marker.resource.path.split('/').pop()} (${marker.startLineNumber}, ${marker.startColumn})
|
||||||
|
${marker.source ? `[${marker.source}]` : ''}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`)}
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async navigateToProblem(marker: typeof this.diagnosticMarkers[0]) {
|
||||||
|
// Extract file path from resource
|
||||||
|
const filePath = marker.resource.path;
|
||||||
|
const fileName = filePath.split('/').pop() || '';
|
||||||
|
|
||||||
|
// Open the file if not already open
|
||||||
|
const existingFile = this.openFiles.find(f => f.path === filePath);
|
||||||
|
if (!existingFile) {
|
||||||
|
await this.openFile(filePath, fileName);
|
||||||
|
} else {
|
||||||
|
this.activeFilePath = filePath;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait for editor to be ready, then navigate to the line
|
||||||
|
await this.updateComplete;
|
||||||
|
const editorElement = this.shadowRoot?.querySelector('dees-editor-monaco') as DeesEditorMonaco;
|
||||||
|
if (editorElement) {
|
||||||
|
const editor = await editorElement.editorDeferred.promise;
|
||||||
|
editor.revealLineInCenter(marker.startLineNumber);
|
||||||
|
editor.setPosition({
|
||||||
|
lineNumber: marker.startLineNumber,
|
||||||
|
column: marker.startColumn,
|
||||||
|
});
|
||||||
|
editor.focus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private setupMarkerListener() {
|
||||||
|
const monacoInstance = (window as any).monaco;
|
||||||
|
if (!monacoInstance) return;
|
||||||
|
|
||||||
|
// Listen for marker changes
|
||||||
|
monacoInstance.editor.onDidChangeMarkers((uris: any[]) => {
|
||||||
|
this.updateDiagnosticMarkers();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Initial load
|
||||||
|
this.updateDiagnosticMarkers();
|
||||||
|
}
|
||||||
|
|
||||||
|
private updateDiagnosticMarkers() {
|
||||||
|
const monacoInstance = (window as any).monaco;
|
||||||
|
if (!monacoInstance) return;
|
||||||
|
|
||||||
|
// Get all markers from Monaco
|
||||||
|
const allMarkers = monacoInstance.editor.getModelMarkers({});
|
||||||
|
|
||||||
|
// Transform to our format
|
||||||
|
this.diagnosticMarkers = allMarkers.map((m: any) => ({
|
||||||
|
message: m.message,
|
||||||
|
severity: m.severity,
|
||||||
|
startLineNumber: m.startLineNumber,
|
||||||
|
startColumn: m.startColumn,
|
||||||
|
endLineNumber: m.endLineNumber,
|
||||||
|
endColumn: m.endColumn,
|
||||||
|
source: m.source,
|
||||||
|
resource: { path: m.resource.path },
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
public async saveActiveFile(): Promise<void> {
|
public async saveActiveFile(): Promise<void> {
|
||||||
const file = this.openFiles.find(f => f.path === this.activeFilePath);
|
const file = this.openFiles.find(f => f.path === this.activeFilePath);
|
||||||
if (!file || !this.executionEnvironment) return;
|
if (!file || !this.executionEnvironment) return;
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ interface IMonacoTypeScriptAPI {
|
|||||||
setCompilerOptions(options: Record<string, unknown>): void;
|
setCompilerOptions(options: Record<string, unknown>): void;
|
||||||
setDiagnosticsOptions(options: Record<string, unknown>): void;
|
setDiagnosticsOptions(options: Record<string, unknown>): void;
|
||||||
addExtraLib(content: string, filePath?: string): void;
|
addExtraLib(content: string, filePath?: string): void;
|
||||||
|
setEagerModelSync(value: boolean): void;
|
||||||
};
|
};
|
||||||
ScriptTarget: { ES2020: number };
|
ScriptTarget: { ES2020: number };
|
||||||
ModuleKind: { ESNext: number };
|
ModuleKind: { ESNext: number };
|
||||||
@@ -40,6 +41,50 @@ export class TypeScriptIntelliSenseManager {
|
|||||||
this.monacoInstance = monacoInst;
|
this.monacoInstance = monacoInst;
|
||||||
this.executionEnvironment = env;
|
this.executionEnvironment = env;
|
||||||
this.configureCompilerOptions();
|
this.configureCompilerOptions();
|
||||||
|
// Load all project TypeScript/JavaScript files into Monaco for cross-file resolution
|
||||||
|
await this.loadAllProjectFiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recursively load all .ts/.js files from the virtual filesystem into Monaco
|
||||||
|
*/
|
||||||
|
private async loadAllProjectFiles(): Promise<void> {
|
||||||
|
if (!this.executionEnvironment) return;
|
||||||
|
await this.loadFilesFromDirectory('/');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recursively load files from a directory
|
||||||
|
*/
|
||||||
|
private async loadFilesFromDirectory(dirPath: string): Promise<void> {
|
||||||
|
if (!this.executionEnvironment) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const entries = await this.executionEnvironment.readdir(dirPath);
|
||||||
|
|
||||||
|
for (const entry of entries) {
|
||||||
|
const fullPath = dirPath === '/' ? `/${entry.name}` : `${dirPath}/${entry.name}`;
|
||||||
|
|
||||||
|
// Skip node_modules - too large and handled separately via addExtraLib
|
||||||
|
if (entry.name === 'node_modules') continue;
|
||||||
|
|
||||||
|
if (entry.isDirectory()) {
|
||||||
|
await this.loadFilesFromDirectory(fullPath);
|
||||||
|
} else if (entry.isFile()) {
|
||||||
|
const ext = entry.name.split('.').pop()?.toLowerCase();
|
||||||
|
if (ext === 'ts' || ext === 'tsx' || ext === 'js' || ext === 'jsx') {
|
||||||
|
try {
|
||||||
|
const content = await this.executionEnvironment.readFile(fullPath);
|
||||||
|
this.addFileModel(fullPath, content);
|
||||||
|
} catch {
|
||||||
|
// Ignore files that can't be read
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Directory might not exist or not be readable
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private configureCompilerOptions(): void {
|
private configureCompilerOptions(): void {
|
||||||
@@ -56,6 +101,7 @@ export class TypeScriptIntelliSenseManager {
|
|||||||
noEmit: true,
|
noEmit: true,
|
||||||
allowJs: true,
|
allowJs: true,
|
||||||
checkJs: false,
|
checkJs: false,
|
||||||
|
allowNonTsExtensions: true,
|
||||||
lib: ['es2020', 'dom', 'dom.iterable'],
|
lib: ['es2020', 'dom', 'dom.iterable'],
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -63,6 +109,10 @@ export class TypeScriptIntelliSenseManager {
|
|||||||
noSemanticValidation: false,
|
noSemanticValidation: false,
|
||||||
noSyntaxValidation: false,
|
noSyntaxValidation: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Enable eager model sync so TypeScript immediately processes all models
|
||||||
|
// This is critical for cross-file IntelliSense to work without requiring edits
|
||||||
|
ts.typescriptDefaults.setEagerModelSync(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user