Changeset 9674 for branches

Timestamp:

06/29/13 18:04:06 (11 years ago)

Author:

gkronber

Message:

#2026: Worked on integration of ICSharpCode.AvalonEdit control for GPDL syntax-highlighting and error reporting.

Location:

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4

Files:

• CodeEditor.xaml (added)
• CodeEditor.xaml.cs (added)
• ColorizeErrors.cs (added)
• GpdlCompletionData.cs (added)
• GpdlEditor.Designer.cs (modified) (6 diffs)
• GpdlEditor.cs (modified) (3 diffs)
• HeuristicLab.Problems.GPDL.Views-3.4.csproj (modified) (6 diffs)
• ICSharpCode.AvalonEdit.dll (added)
• Plugin.cs.frame (modified) (1 diff)
• Properties/Resources.Designer.cs (modified) (1 diff)
• Properties/Resources.resx (modified) (1 diff)
• Resources/GPDL.xshd (added)
• SyntaxDefinition.xsd (added)

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlEditor.Designer.cs

@@ -28 +28 @@
     private void InitializeComponent() {
       this.compileButton = new System.Windows.Forms.Button();
-      this.gpdlTextBox = new System.Windows.Forms.TextBox();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.elementHost = new System.Windows.Forms.Integration.ElementHost();
+      this.codeEditor = new HeuristicLab.Problems.GPDL.Views.CodeEditor();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -48 +49 @@
       this.compileButton.Click += new System.EventHandler(this.compileButton_Click);
       // 
-      // gpdlTextBox
-      // 
-      this.gpdlTextBox.AcceptsReturn = true;
-      this.gpdlTextBox.AcceptsTab = true;
-      this.gpdlTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.gpdlTextBox.Font = new System.Drawing.Font("Courier New", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-      this.gpdlTextBox.Location = new System.Drawing.Point(3, 3);
-      this.gpdlTextBox.Multiline = true;
-      this.gpdlTextBox.Name = "gpdlTextBox";
-      this.gpdlTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-      this.gpdlTextBox.Size = new System.Drawing.Size(655, 422);
-      this.gpdlTextBox.TabIndex = 1;
-      // 
       // splitContainer
       // 
@@ -77 +63 @@
       // splitContainer.Panel2
       // 
+      this.splitContainer.Panel2.Controls.Add(this.elementHost);
       this.splitContainer.Panel2.Controls.Add(this.compileButton);
-      this.splitContainer.Panel2.Controls.Add(this.gpdlTextBox);
       this.splitContainer.Size = new System.Drawing.Size(661, 487);
       this.splitContainer.SplitterDistance = 26;
@@ -97 +83 @@
       this.viewHost.ViewType = null;
       // 
+      // elementHost
+      // 
+      this.elementHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.elementHost.Location = new System.Drawing.Point(0, 0);
+      this.elementHost.Name = "elementHost";
+      this.elementHost.Size = new System.Drawing.Size(661, 425);
+      this.elementHost.TabIndex = 2;
+      this.elementHost.Text = "elementHost2";
+      this.elementHost.Child = this.codeEditor;
+      // 
       // GpdlEditor
       // 
@@ -106 +104 @@
       this.splitContainer.Panel1.ResumeLayout(false);
       this.splitContainer.Panel2.ResumeLayout(false);
-      this.splitContainer.Panel2.PerformLayout();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
@@ -117 +114 @@
     private ViewHost viewHost;
     private System.Windows.Forms.Button compileButton;
-    private System.Windows.Forms.TextBox gpdlTextBox;
     private System.Windows.Forms.SplitContainer splitContainer;
+    private System.Windows.Forms.Integration.ElementHost elementHost;
+    private CodeEditor codeEditor;
   }
 }

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlEditor.cs

@@ -19 +19 @@
 
     private void compileButton_Click(object sender, EventArgs e) {
-      Utils.InstallModule("Utils", new Utils.ModuleMethodDelegate(Utils.UtilsMethod));
-      Utils.InstallModule("Sets", new Utils.ModuleMethodDelegate(Sets.SetsMethod));
-      Utils.InstallModule("Errors", new Utils.ModuleMethodDelegate(Errors.ErrorsMethod));
+      Utils.InstallModule("Utils", Utils.UtilsMethod);
+      Utils.InstallModule("Sets", Sets.SetsMethod);
+      Utils.InstallModule("Errors", Errors.ErrorsMethod);
 
-      Utils.InstallModule("GPDefLex", new Utils.ModuleMethodDelegate(GPDefLex.GPDefLexMethod));
-      Utils.InstallModule("GPDefSem", new Utils.ModuleMethodDelegate(GPDefSem.GPDefSemMethod));
-      Utils.InstallModule("GPDefSyn", new Utils.ModuleMethodDelegate(GPDefSyn.GPDefSynMethod));
+      Utils.InstallModule("GPDefLex", GPDefLex.GPDefLexMethod);
+      Utils.InstallModule("GPDefSem", GPDefSem.GPDefSemMethod);
+      Utils.InstallModule("GPDefSyn", GPDefSyn.GPDefSynMethod);
 
       // --- initialize modules ---
@@ -32 +32 @@
       Errors.PushAbortMethod(new Errors.AbortMethod(Abort));
 
-      using (var src = new StringReader(gpdlTextBox.Text)) {
+      using (var src = new StringReader(codeEditor.textEditor.Text)) {
         GPDefLex.src = src;
         GPDefSyn.Parse();
       }
 
-      GPDefLex.InitLex();
-      GPDefSyn.Interpret();
+      codeEditor.ClearErrors();
 
-      MainForm.MainFormManager.MainForm.ShowContent(GPDefSem.problem);
+      if (Errors.NumOfErrors() == 0) {
+        GPDefLex.InitLex();
+        GPDefSyn.Interpret();
+
+        MainForm.MainFormManager.MainForm.ShowContent(GPDefSem.problem);
+      } else {
+        int nLexErrors = Errors.NumOfLexErrors();
+        for (int i = 0; i < nLexErrors; i++) {
+          var lexErr = Errors.GetLexError(i == 0);
+          codeEditor.SetLexError(lexErr.msg, lexErr.line, lexErr.col);
+        }
+        int nSynErrors = Errors.NumOfSynErrors();
+        for (int i = 0; i < nSynErrors; i++) {
+          var synErr = Errors.GetSynError(i == 0);
+          codeEditor.SetLexError(synErr.msg, synErr.line, synErr.col);
+        }
+      }
     }
 
@@ -48 +63 @@
 
     void IProblemInstanceConsumer<string>.Load(string data) {
-      this.gpdlTextBox.Text = data;
+      codeEditor.textEditor.Text = data;
     }
-
   }
 }

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/HeuristicLab.Problems.GPDL.Views-3.4.csproj

@@ -143 +143 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=4.3.1.9430, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>.\ICSharpCode.AvalonEdit.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -150 +157 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Forms.DataVisualization" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -158 +166 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
+    <Reference Include="WindowsBase" />
+    <Reference Include="WindowsFormsIntegration" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CodeEditor.xaml.cs">
+      <DependentUpon>CodeEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ColorizeErrors.cs" />
+    <Compile Include="GpdlCompletionData.cs" />
     <Compile Include="GpdlProblemInstanceConsumerView.cs">
       <SubType>UserControl</SubType>
@@ -182 +197 @@
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
+    <None Include="SyntaxDefinition.xsd">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
@@ -219 +237 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\GPDL.xshd" />
     <None Include="Resources\multi-output-multiplier.txt" />
   </ItemGroup>
@@ -233 +252 @@
       <Private>False</Private>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="CodeEditor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ICSharpCode.AvalonEdit.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/Plugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Problems.GPDL.Views","Provides views to define genetic programming problems using GPDL.", "3.4.0.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.GPDL.Views-3.4.dll", PluginFileType.Assembly)]
+  [PluginFile("ICSharpCode.AvalonEdit.dll", PluginFileType.Assembly)]
   public class Plugin : PluginBase {
   }

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/Properties/Resources.Designer.cs

@@ -146 +146 @@
         
         /// <summary>
+        ///   Looks up a localized string similar to &lt;!-- Syntax definition of GPDL for Avalonedit syntax highlighting --&gt;
+        ///&lt;SyntaxDefinition name=&quot;GPDL&quot;
+        ///        xmlns=&quot;http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008&quot;&gt;
+        ///  &lt;Color name=&quot;Comment&quot; foreground=&quot;Green&quot; /&gt;
+        ///  &lt;Color name=&quot;String&quot; foreground=&quot;Blue&quot; /&gt;
+        ///
+        ///  &lt;!-- This is the main ruleset. --&gt;
+        ///  &lt;RuleSet&gt;
+        ///    &lt;Span color=&quot;Comment&quot; multiline=&quot;true&quot; nested=&quot;true&quot;
+        ///       begin=&quot;/\*&quot; end=&quot;\*/&quot; /&gt;
+        ///
+        ///    &lt;Span color=&quot;SourceCode&quot; multiline=&quot;true&quot;
+        ///       begin=&quot;&amp;lt;&amp;lt;&quot; end=&quot;&amp;gt;&amp;gt;&quot; /&gt;
+        ///    &lt;K [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string GPDL {
+            get {
+                return ResourceManager.GetString("GPDL", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to PROBLEM MultiOutputMultiplier
         ///

branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/Properties/Resources.resx

@@ -128 +128 @@
     <value>..\Resources\Fib.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="GPDL" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GPDL.xshd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
   <data name="multi_output_multiplier" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\multi-output-multiplier.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>