diff options
Diffstat (limited to 'Software/Visual_Studio/Scripting')
7 files changed, 71 insertions, 17 deletions
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs index fef43a35f..13ebda6bb 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs @@ -21,6 +21,8 @@ namespace Tango.Scripting.Basic { public class Project<T> : ExtendedObject where T : IContext { + public String ID { get; set; } + private String _name; public String Name { @@ -52,6 +54,8 @@ namespace Tango.Scripting.Basic public Project() { + ID = Guid.NewGuid().ToString(); + ApartmentState = ApartmentState.MTA; ReferenceAssemblies = new ObservableCollection<ReferenceAssembly>(); @@ -65,7 +69,7 @@ namespace Tango.Scripting.Basic return Task.Factory.StartNew<CompilationResult>(() => { var result = new CompilationResult(); - var tempFolder = TemporaryManager.CreateFolder(Name); + var tempFolder = TemporaryManager.CreateFolder(Name + "_" + ID); result.TemporaryProjectPath = tempFolder; String mainScriptCode = String.Empty; diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd index ead5045ab..8e02db898 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd @@ -5,7 +5,6 @@ <Color name="StrongEmphasis" fontWeight="bold" exampleText="**this** is more important!" /> <Color name="Code" exampleText="this is `int.GetHashCode()`" /> <Color name="BlockQuote" foreground="DarkBlue" exampleText="> This is a\r\n> quote." /> - <Color name="Link" foreground="Blue" exampleText="[text](http://example.com)" /> <Color name="Image" foreground="Green" exampleText="[text][http://example.com/test.png]" /> <Color name="LineBreak" background="LightGray" exampleText="end of line \r\n2nd line " /> @@ -43,12 +42,6 @@ <Rule color="Image"> \!\[.*\]\[.*\] </Rule> - <Rule color="Link"> - \[.*\]\(.*\) - </Rule> - <Rule color="Link"> - \[.*\]\[.*\] - </Rule> <Rule color="LineBreak"> [ ]{2}$ </Rule> diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd index 8f0bdef76..50fdc0e2c 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd @@ -1,13 +1,13 @@ <SyntaxDefinition name="XML" extensions=".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.wxi;.wxl;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets;.xaml;.xpt;.xft;.map;.wsdl;.disco;.ps1xml;.nuspec" xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008"> <Color foreground="Green" name="Comment" exampleText="<!-- comment -->" /> - <Color foreground="Blue" name="CData" exampleText="<![CDATA[data]]>" /> - <Color foreground="Blue" name="DocType" exampleText="<!DOCTYPE rootElement>" /> - <Color foreground="Blue" name="XmlDeclaration" exampleText='<?xml version="1.0"?>' /> - <Color foreground="DarkMagenta" name="XmlTag" exampleText='<tag attribute="value" />' /> - <Color foreground="Red" name="AttributeName" exampleText='<tag attribute="value" />' /> - <Color foreground="Blue" name="AttributeValue" exampleText='<tag attribute="value" />' /> + <Color foreground="#3F92D6" name="CData" exampleText="<![CDATA[data]]>" /> + <Color foreground="#C8C8C7" name="DocType" exampleText="<!DOCTYPE rootElement>" /> + <Color foreground="#3F92D6" name="XmlDeclaration" exampleText='<?xml version="1.0"?>' /> + <Color foreground="#3F92D6" name="XmlTag" exampleText='<tag attribute="value" />' /> + <Color foreground="#92CAF4" name="AttributeName" exampleText='<tag attribute="value" />' /> + <Color foreground="#C8C8C7" name="AttributeValue" exampleText='<tag attribute="value" />' /> <Color foreground="Teal" name="Entity" exampleText="index.aspx?a=1&amp;b=2" /> - <Color foreground="Olive" name="BrokenEntity" exampleText="index.aspx?a=1&b=2" /> + <Color foreground="Red" name="BrokenEntity" exampleText="index.aspx?a=1&b=2" /> <RuleSet> <Span color="Comment" multiline="true"> diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Rendering/TextView.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Rendering/TextView.cs index 3dabb6b7a..1b1f12ff3 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Rendering/TextView.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Rendering/TextView.cs @@ -554,7 +554,7 @@ namespace Tango.Scripting.Editors.Rendering /// </summary> public static readonly DependencyProperty LinkTextForegroundBrushProperty = DependencyProperty.Register("LinkTextForegroundBrush", typeof(Brush), typeof(TextView), - new FrameworkPropertyMetadata(Brushes.Blue)); + new FrameworkPropertyMetadata(Brushes.Gray)); /// <summary> /// Gets/sets the Brush used for displaying link texts. diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj index 94e3c4b0b..798529616 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj @@ -508,6 +508,7 @@ <Compile Include="Utils\ThrowUtil.cs" /> <Compile Include="Utils\Win32.cs" /> <CodeAnalysisDictionary Include="Properties\CodeAnalysisDictionary.xml" /> + <Compile Include="XamlEditor.cs" /> <Compile Include="Xml\AbstractAXmlVisitor.cs" /> <Compile Include="Xml\AXmlAttribute.cs" /> <Compile Include="Xml\AXmlAttributeCollection.cs" /> @@ -650,7 +651,7 @@ </ItemGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UseGlobalSettings="True" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml index 414006f3a..5de763df3 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml @@ -141,6 +141,15 @@ <Setter Property="Control.Cursor" Value="/Tango.Scripting.Editors;component/themes/RightArrow.cur"/> </Style> + <Style TargetType="{x:Type local:XamlEditor}"> + <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"></Setter> + <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"></Setter> + <Setter Property="FontFamily" Value="Consolas"></Setter> + <Setter Property="FontSize" Value="13"></Setter> + <Setter Property="SyntaxHighlighting" Value="XML"></Setter> + <Setter Property="ShowLineNumbers" Value="True"></Setter> + </Style> + <Style TargetType="{x:Type local:ScriptEditor}"> <Setter Property="Background" Value="{StaticResource ScriptBackgroundBrush}"></Setter> <Setter Property="Foreground" Value="{StaticResource ScriptForegroundBrush}"></Setter> diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/XamlEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/XamlEditor.cs new file mode 100644 index 000000000..22b425ba2 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/XamlEditor.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; + +namespace Tango.Scripting.Editors +{ + public class XamlEditor : TextEditor + { + private bool preventCodeUpdate; + + public String Xaml + { + get { return (String)GetValue(XamlProperty); } + set { SetValue(XamlProperty, value); } + } + public static readonly DependencyProperty XamlProperty = + DependencyProperty.Register("Xaml", typeof(String), typeof(XamlEditor), new PropertyMetadata(null, (d, e) => (d as XamlEditor).OnXamlChanged())); + + public XamlEditor() + { + TextChanged += XamlEditor_TextChanged; + } + + private void XamlEditor_TextChanged(object sender, EventArgs e) + { + if (!preventCodeUpdate) + { + preventCodeUpdate = true; + Xaml = Text; + preventCodeUpdate = false; + } + } + + private void OnXamlChanged() + { + if (!preventCodeUpdate) + { + preventCodeUpdate = true; + Text = Xaml; + preventCodeUpdate = false; + } + } + } +} |