Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed xdc.suo
Binary file not shown.
2 changes: 1 addition & 1 deletion xdc/Forms/AboutForm.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: AboutForm.cs 19 2007-04-30 07:44:15Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
6 changes: 3 additions & 3 deletions xdc/Forms/CallstackForm.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: CallstackForm.cs 14 2007-04-29 17:32:40Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down Expand Up @@ -48,8 +48,8 @@ public void setCallstack(List<StackEntry> stack)
treeView1.Nodes.Clear();

foreach (StackEntry entry in stack)
{
treeView1.Nodes.Add(entry.location + "() at " + entry.fileName + ":" + entry.lineNumber);
{ // Lexikos: Removed "()" before "at" since it doesn't always apply in AHK.
treeView1.Nodes.Add(entry.location + " at " + entry.fileName + ":" + entry.lineNumber);
}
}

Expand Down
2 changes: 1 addition & 1 deletion xdc/Forms/PropertyForm.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: PropertyForm.cs 10 2007-04-29 13:39:20Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
17 changes: 15 additions & 2 deletions xdc/Forms/SourceFileForm.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: SourceFileForm.cs 20 2007-04-30 07:47:59Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down Expand Up @@ -62,6 +62,12 @@ public SourceFileForm(xdc.XDebug.Client xdebugClient, string filename)
this.textEditor.Document.BookmarkManager.Added += new ICSharpCode.TextEditor.Document.BookmarkEventHandler(OnBookmarkAdded);
}

// Lexikos: AutoHotkey syntax highlighting.
static SourceFileForm()
{
HighlightingManager.Manager.AddSyntaxModeFileProvider(new Syntax.AhkSyntaxModeProvider());
}

public void LoadFile(string filename)
{
this.textEditor.LoadFile(filename);
Expand All @@ -88,6 +94,12 @@ public ICSharpCode.TextEditor.Document.BookmarkManager getBookmarkManager()
return this.textEditor.Document.BookmarkManager;
}

// Lexikos
public ICSharpCode.TextEditor.Document.IDocument getDocument()
{
return this.textEditor.Document;
}

private void setLineColor(int lineNumber, Color color)
{
IDocument d = this.textEditor.Document;
Expand Down Expand Up @@ -239,7 +251,8 @@ public void LoadSourceAsFile(string sourceCode)
{
this.textEditor.BeginUpdate();

this.textEditor.Document.HighlightingStrategy = ICSharpCode.TextEditor.Document.HighlightingStrategyFactory.CreateHighlightingStrategy("PHP");
// Lexikos: Use AHK syntax highlighting.
this.textEditor.Document.HighlightingStrategy = ICSharpCode.TextEditor.Document.HighlightingStrategyFactory.CreateHighlightingStrategy("AHK");

this.textEditor.Text = sourceCode;

Expand Down
2 changes: 1 addition & 1 deletion xdc/Forms/StatusForm.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: StatusForm.cs 14 2007-04-29 17:32:40Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
2 changes: 1 addition & 1 deletion xdc/GUI/DebugNode.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: DebugNode.cs 10 2007-04-29 13:39:20Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
2 changes: 1 addition & 1 deletion xdc/GUI/FileLoader/FileLoaderFactory.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: FileLoaderFactory.cs 9 2007-04-29 13:36:27Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
2 changes: 1 addition & 1 deletion xdc/GUI/FileLoader/IFileLoader.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: IFileLoader.cs 19 2007-04-30 07:44:15Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
4 changes: 2 additions & 2 deletions xdc/GUI/FileLoader/RewriteFileLoader.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: RewriteFileLoader.cs 19 2007-04-30 07:44:15Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down Expand Up @@ -133,7 +133,7 @@ public DirectoryRewrite DetermineRewriteRule(string filename)

/* This should have a way to also detect filename[1].php, filename[2].php for
* the FTP service. */
fileDialog.Filter = "PHP file|" + sourceFilename;
fileDialog.Filter = "Source file|" + sourceFilename; // Lexikos: Changed "PHP" to "Source"

if (fileDialog.ShowDialog() == DialogResult.OK)
{
Expand Down
2 changes: 1 addition & 1 deletion xdc/GUI/FileLoader/SourceFileLoader.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: SourceFileLoader.cs 19 2007-04-30 07:44:15Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
2 changes: 1 addition & 1 deletion xdc/GUI/FileManager.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: FileManager.cs 14 2007-04-29 17:32:40Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
23 changes: 21 additions & 2 deletions xdc/MainForm.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: MainForm.cs 19 2007-04-30 07:44:15Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down Expand Up @@ -147,6 +147,9 @@ private void StopDebuggingSession()
this.ToggleMenuItems(false);

_statusFrm.WriteStatusLine("(!) Debugging session terminated.");

// Lexikos: Begin listening automatically.
startListeningToolStripMenuItem_Click(this, null);
}

private void WriteDebugLine(string line)
Expand All @@ -169,7 +172,8 @@ private void SetActiveFileAndLine(Location location)
if (_CurrentLocation.line != -1)
{
xdc.Forms.SourceFileForm previousFile = _fileMgr.getFormByRemoteFilename(_CurrentLocation.filename);
previousFile.RemoveActiveMark();
if (previousFile != null) // Lexikos: Check for null!
previousFile.RemoveActiveMark();
}

_CurrentLocation.line = location.line;
Expand Down Expand Up @@ -478,6 +482,18 @@ private void SourceFileForm_FileClosed(object sender, FormClosedEventArgs e)
string localFilename = _fileMgr.GetLocalFilename(f.getFilename());

_fileMgr.Remove(localFilename);

// Lexikos~
ICSharpCode.TextEditor.Document.IDocument document = f.getDocument();
// Remove this file's breakpoints from _breakpointMgr since otherwise
// a) the file text is kept in memory, and
// b) if the file is reopened, it has invisible breakpoints.
_breakpointMgr.Breakpoints.RemoveAll(
delegate(Breakpoint breakpoint)
{
return breakpoint.Document == document;
});
// ~L

closeToolStripMenuItem.Enabled = _fileMgr.HasOpenFiles;

Expand All @@ -498,6 +514,9 @@ private void MainForm_Load(object sender, EventArgs e)
{
_callstackFrm.Show(this.dockPanel, DockState.DockBottom);
_statusFrm.Show(_callstackFrm.Pane, _callstackFrm);

// Lexikos: Continue listening automatically.
startListeningToolStripMenuItem_Click(this, null);
}

private void runToolStripMenuItem_Click(object sender, EventArgs e)
Expand Down
2 changes: 1 addition & 1 deletion xdc/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: Program.cs 10 2007-04-29 13:39:20Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
2 changes: 1 addition & 1 deletion xdc/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C), 2007, Mathieu Kooiman < xdc@scriptorama.nl>
* $Id$
* $Id: AssemblyInfo.cs 10 2007-04-29 13:39:20Z mathieuk $
*
* This file is part of XDebugClient.
*
Expand Down
44 changes: 18 additions & 26 deletions xdc/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions xdc/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
Expand All @@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
Expand All @@ -68,9 +69,10 @@
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
Expand All @@ -85,9 +87,10 @@
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
Expand Down
Loading