Skip to content
Permalink
Browse files

VS plugin separated into VS2010 and new VS versions

Release v1.9.0 compatible with VS 2015+
  • Loading branch information...
zapov committed Feb 28, 2019
1 parent c84cf08 commit 6e4ad0855c33b9d96e62c3c7879c52b6e841087c
Showing with 984 additions and 1,011 deletions.
  1. +2 −1 VisualStudioPlugin/.gitignore
  2. +400 −0 VisualStudioPlugin/2010/DSLPlatform.2010.csproj
  3. 0 VisualStudioPlugin/{ → 2010}/DSLPlatform.vsct
  4. BIN VisualStudioPlugin/2010/Resources/Images_24bit.bmp
  5. BIN VisualStudioPlugin/2010/Resources/Images_32bit.bmp
  6. BIN VisualStudioPlugin/2010/Resources/Package.ico
  7. +18 −10 VisualStudioPlugin/{Resources.resx → 2010/VSPackage.resx}
  8. 0 VisualStudioPlugin/{source.extension.vsixmanifest.vs2010 → 2010/source.extension.vsixmanifest}
  9. +0 −27 VisualStudioPlugin/Classification/ClassificationFormat.cs
  10. +0 −9 VisualStudioPlugin/Classification/ClassificationType.cs
  11. +28 −0 VisualStudioPlugin/Classification/FileAndContentTypeDefinition.cs
  12. +14 −4 VisualStudioPlugin/{Guids.cs → Constants.cs}
  13. +0 −326 VisualStudioPlugin/DSLPlatform.2010.csproj
  14. +1 −1 VisualStudioPlugin/DSLPlatform.VS2010.sln
  15. +171 −106 VisualStudioPlugin/DSLPlatform.csproj
  16. +7 −11 VisualStudioPlugin/DSLPlatform.sln
  17. +77 −77 VisualStudioPlugin/DSLPlatformPackage.cs
  18. +60 −0 VisualStudioPlugin/DSLPlatformPackage.vsct
  19. +1 −1 VisualStudioPlugin/Gui/CompileTargets.cs
  20. +3 −3 VisualStudioPlugin/Gui/DiffPlex/DiffPlexControl.xaml
  21. +1 −0 VisualStudioPlugin/Gui/DiffPlex/DiffPlexControl.xaml.cs
  22. +1 −19 VisualStudioPlugin/Gui/ToolWindow.cs
  23. +3 −3 VisualStudioPlugin/Gui/View/AboutControl.xaml
  24. +5 −5 VisualStudioPlugin/Gui/View/DiffControl.xaml
  25. +4 −4 VisualStudioPlugin/Gui/View/ToolContent.xaml
  26. +0 −12 VisualStudioPlugin/PkgCmdID.cs
  27. +2 −2 VisualStudioPlugin/Properties/AssemblyInfo.cs
  28. +0 −93 VisualStudioPlugin/Resources.Designer.cs
  29. +123 −142 VisualStudioPlugin/VSPackage.resx
  30. +5 −2 VisualStudioPlugin/VisualStudioItemTemplate/VisualStudioItemTemplate.csproj
  31. +31 −0 VisualStudioPlugin/packages.config
  32. +27 −24 VisualStudioPlugin/source.extension.vsixmanifest
  33. +0 −129 VisualStudioPlugin/stylesheet.css
@@ -25,4 +25,5 @@ obj/
_ReSharper*/
Dotfuscated/
[Tt]est[Rr]esult*
.vs/
.vs/
packages/

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
VS SDK Notes: This resx file contains the resources that will be consumed directly by your package.
For example, if you chose to create a tool window, there is a resource with ID 'CanNotCreateWindow'. This
is used in VsPkg.cs to determine the string to show the user if there is an error when attempting to create
the tool window.
VS SDK Notes: This resx file contains the resources that will be consumed from your package by Visual Studio.
For example, Visual Studio will attempt to load resource '400' from this resource stream when it needs to
load your package's icon. Because Visual Studio will always look in the VSPackage.resources stream first for
resources it needs, you should put additional resources that Visual Studio will load directly into this resx
file.
Resources that are accessed directly from your package *by Visual Studio* are stored in the VSPackage.resx
file.
Resources that you would like to access directly from your package in a strong-typed fashion should be stored
in Resources.resx or another resx file.
-->
<root>
<!--
@@ -126,10 +127,17 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CanNotCreateWindow" xml:space="preserve">
<value>Can not create tool window.</value>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="110" xml:space="preserve">
<value>DSLPlatform</value>
</data>
<data name="ToolWindowTitle" xml:space="preserve">
<value>DSL Platform</value>
<data name="112" xml:space="preserve">
<value>VS integration for DSL Platform</value>
</data>
<data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Package.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="301" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Images_24bit.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
@@ -5,68 +5,41 @@

namespace DSLPlatform
{
/// <summary>
/// Defines an editor format for the OrdinaryClassification type that has a purple background
/// and is underlined.
/// </summary>
[Export(typeof(EditorFormatDefinition))]
[ClassificationType(ClassificationTypeNames = "ddd-keyword")]
[Name("ddd-keyword")]
//this should be visible to the end user
[UserVisible(false)]
//set the priority to be after the default classifiers
[Order(Before = Priority.Default)]
internal sealed class DddKeyword : ClassificationFormatDefinition
{
/// <summary>
/// Defines the visual format for the "ordinary" classification type
/// </summary>
public DddKeyword()
{
this.DisplayName = "Keyword"; //human readable version of the name
this.ForegroundColor = Colors.SlateBlue;
}
}

/// <summary>
/// Defines an editor format for the OrdinaryClassification type that has a purple background
/// and is underlined.
/// </summary>
[Export(typeof(EditorFormatDefinition))]
[ClassificationType(ClassificationTypeNames = "ddd-identifier")]
[Name("ddd-identifier")]
//this should be visible to the end user
[UserVisible(false)]
//set the priority to be after the default classifiers
[Order(Before = Priority.Default)]
internal sealed class DddIdentifier : ClassificationFormatDefinition
{
/// <summary>
/// Defines the visual format for the "ordinary" classification type
/// </summary>
public DddIdentifier()
{
this.DisplayName = "Identifier"; //human readable version of the name
this.ForegroundColor = Colors.LightSeaGreen;
}
}

/// <summary>
/// Defines an editor format for the OrdinaryClassification type that has a purple background
/// and is underlined.
/// </summary>
[Export(typeof(EditorFormatDefinition))]
[ClassificationType(ClassificationTypeNames = "ddd-stringQuote")]
[Name("ddd-stringQuote")]
//this should be visible to the end user
[UserVisible(false)]
//set the priority to be after the default classifiers
[Order(Before = Priority.Default)]
internal sealed class DddStringQuote : ClassificationFormatDefinition
{
/// <summary>
/// Defines the visual format for the "ordinary" classification type
/// </summary>
public DddStringQuote()
{
this.DisplayName = "Expression or quote"; //human readable version of the name
@@ -6,23 +6,14 @@ namespace DSLPlatform
{
internal static class OrdinaryClassificationDefinition
{
/// <summary>
/// Defines the "ordinary" classification type.
/// </summary>
[Export(typeof(ClassificationTypeDefinition))]
[Name("ddd-keyword")]
internal static ClassificationTypeDefinition DddKeyword = null;

/// <summary>
/// Defines the "ordinary" classification type.
/// </summary>
[Export(typeof(ClassificationTypeDefinition))]
[Name("ddd-identifier")]
internal static ClassificationTypeDefinition DddIdentifier = null;

/// <summary>
/// Defines the "ordinary" classification type.
/// </summary>
[Export(typeof(ClassificationTypeDefinition))]
[Name("ddd-stringQuote")]
internal static ClassificationTypeDefinition DddStringQuote = null;
@@ -0,0 +1,28 @@
using Microsoft.VisualStudio.Utilities;
using System.ComponentModel.Composition;

namespace DSLPlatform
{
internal static class FileAndContentTypeDefinitions
{
[Export]
[Name("dsl")]
[BaseDefinition("text")]
internal static ContentTypeDefinition hidingContentTypeDefinitionDsl;

[Export]
[Name("ddd")]
[BaseDefinition("text")]
internal static ContentTypeDefinition hidingContentTypeDefinitionDdd;

[Export]
[FileExtension(".dsl")]
[ContentType("dsl")]
internal static FileExtensionToContentTypeDefinition hiddenFileExtensionDefinitionDsl;

[Export]
[FileExtension(".ddd")]
[ContentType("ddd")]
internal static FileExtensionToContentTypeDefinition hiddenFileExtensionDefinitionDdd;
}
}
@@ -1,6 +1,5 @@
// Guids.cs
// MUST match guids.h
using System;
using System;
using Microsoft.VisualStudio.Shell;

namespace DSLPlatform
{
@@ -12,8 +11,19 @@ static class GuidList

public static readonly Guid guidDSLPlatformCmdSet = new Guid(guidDSLPlatformCmdSetString);
}
static class PkgCmdIDList
{
public const int cmdDslPlatformCmd = 0x100;
public const int cmdDslPlatformTool = 0x101;
public const int cmdCompileDslCmd = 0x102;
}
static class Constants
{
public const string vsProjectKindUnmodeled = "{67294A52-A4F0-11D2-AA88-00C04F688DDE}";
}
}
public class VsColors
{
public static object Foreground { get { return VsBrushes.CommandBarTextActiveKey; } }
public static object Background { get { return VsBrushes.CommandBarOptionsBackgroundKey; } }
}
}
Oops, something went wrong.

0 comments on commit 6e4ad08

Please sign in to comment.
You can’t perform that action at this time.