Permalink
Browse files

Changes needed for RTM. Will no longer install on RC

  • Loading branch information...
1 parent 28fcaa6 commit d2bda8dc6eb029636a70d751b7e52a11384b2111 @madskristensen committed Jun 3, 2015
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Linq;
-using Microsoft.Html.Editor.Completion;
-using Microsoft.Html.Editor.Completion.Def;
-using Microsoft.VisualStudio.Utilities;
-using Microsoft.Web.Editor.Completion;
-
-namespace MadsKristensen.EditorExtensions.Html
-{
- [HtmlCompletionProvider(CompletionTypes.Attributes, "*")]
- [Export(typeof(IHtmlCompletionListFilter))]
- [ContentType("jsx")]
- public class JsxCompletion : IHtmlCompletionListProvider, IHtmlCompletionListFilter
- {
- public string CompletionType
- {
- get
- {
- return CompletionTypes.Attributes;
- }
- }
-
- private static string[] _filter = new[] { "class", "for" };
-
- public void FilterCompletionList(IList<HtmlCompletion> completions, HtmlCompletionContext context)
- {
- if (!context.DocumentContentType.IsOfType("jsx"))
- return;
-
- foreach (var completion in completions)
- {
- if (_filter.Contains(completion.DisplayText))
- completion.FilterType = CompletionEntryFilterTypes.NeverVisible;
-
- if (completion.DisplayText.StartsWith("on", StringComparison.Ordinal) && completion.DisplayText.Length > 2)
- {
- char third = completion.DisplayText[2];
- completion.DisplayText = "on" + char.ToUpperInvariant(third) + completion.DisplayText.Substring(3);
-
- completion.DisplayText = completion.DisplayText.Replace("change", "Change")
- .Replace("start", "Start")
- .Replace("stop", "Stop")
- .Replace("enter", "Enter")
- .Replace("leave", "Leave")
- .Replace("over", "Over")
- .Replace("end", "End")
- .Replace("play", "Play")
- .Replace("menu", "Menu")
- .Replace("input", "Input")
- .Replace("down", "Down")
- .Replace("out", "Out")
- .Replace("press", "Press")
- .Replace("up", "Up")
- .Replace("move", "Move")
- .Replace("update", "Update")
- .Replace("wheel", "Wheel")
- .Replace("metadata", "Metadata")
- .Replace("through", "Through")
- .Replace("click", "Click");
- }
- }
- }
-
- public IList<HtmlCompletion> GetEntries(HtmlCompletionContext context)
- {
- List<HtmlCompletion> list = new List<HtmlCompletion>();
- list.Add(new SimpleHtmlCompletion("className", context.Session));
-
- if (context.Element.Name == "label")
- list.Add(new SimpleHtmlCompletion("htmlFor", context.Session));
-
- return list;
- }
- }
-}
@@ -7,6 +7,8 @@
using System.Windows.Media.Imaging;
using Microsoft.Html.Core.Tree.Nodes;
using Microsoft.Html.Editor.SuggestedActions;
+using Microsoft.VisualStudio.Imaging;
+using Microsoft.VisualStudio.Imaging.Interop;
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.Web.Editor.Text;
@@ -15,14 +17,13 @@ namespace MadsKristensen.EditorExtensions.Html
{
internal class HtmlAngularControllerLightBulbAction : HtmlSuggestedActionBase
{
- private static BitmapFrame _icon = BitmapFrame.Create(new Uri("pack://application:,,,/WebEssentials2015;component/Resources/Images/angular.png", UriKind.RelativeOrAbsolute));
private AttributeNode _ngController;
public HtmlAngularControllerLightBulbAction(ITextView textView, ITextBuffer textBuffer, ElementNode element, AttributeNode attribute)
: base(textView, textBuffer, element, attribute, "Add new Angular Controller")
{
_ngController = attribute;
- IconSource = _icon;
+ IconMoniker = KnownMonikers.JSScript;
}
public async override void Invoke(CancellationToken cancellationToken)
@@ -140,7 +140,7 @@ public override bool IsDestructiveChange(int start, int oldLength, int newLength
return false;
}
- public override ICollection<IArtifact> ReflectTextChange(int start, int oldLength, int newLength)
+ public override IReadOnlyCollection<IArtifact> ReflectTextChange(int start, int oldLength, int newLength)
{
// Forward the change to any collections of artifacts
// that have been removed from this main collection.
@@ -46,7 +46,7 @@ public class MarkdownClassifier : IClassifier
private static readonly Regex _reQuote = new Regex(lineBegin + @"( {0,3}>)+(?<Value> {0,3}[^\r\n]+)(?:$|\r?\n|\r)");
- private static readonly Regex _reHeader = new Regex(lineBegin + @"(?<Value>([#]{1,6})[^#\r\n]+(\1(?!#))?)");
+ private static readonly Regex _reHeader = new Regex(lineBegin + @"(?<Value>([#]{1,6})\s[^#\r\n]+(\1(?!#))?)");
private readonly IClassificationType codeType;
private readonly IReadOnlyCollection<Tuple<Regex, IClassificationType>> typeRegexes;
@@ -256,6 +256,7 @@ class MarkdownCompilerRunner : CompilerRunnerBase
protected async override Task<CompilerResult> RunCompilerAsync(string sourcePath, string targetPath)
{
var cmSettings = CommonMark.CommonMarkSettings.Default.Clone();
+ cmSettings.AdditionalFeatures = CommonMark.CommonMarkAdditionalFeatures.All;
cmSettings.RenderSoftLineBreaksAsLineBreaks = WESettings.Instance.Markdown.RenderSoftLineBreaksAsLineBreaks;
cmSettings.TrackSourcePosition = WESettings.Instance.Markdown.TrackSourcePosition;
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
- <Identity Id="5fb7364d-2e8c-44a4-95eb-2a382e30fec9" Version="0.4" Language="en-US" Publisher="Mads Kristensen" />
+ <Identity Id="5fb7364d-2e8c-44a4-95eb-2a382e30fec9" Version="0.5" Language="en-US" Publisher="Mads Kristensen" />
<DisplayName>Web Essentials 2015.0 RC</DisplayName>
<Description xml:space="preserve">Adds many useful features to Visual Studio for web developers. Requires Visual Studio 2015 RC</Description>
<MoreInfo>http://vswebessentials.com/</MoreInfo>
@@ -13,7 +13,7 @@
<Tags>css, javascript, html, json, markdown</Tags>
</Metadata>
<Installation InstalledByMsi="false">
- <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[14.0.22800, 14.0.22825)" />
+ <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[14.0.23000, 14.0.23020)" />
</Installation>
<Dependencies>
@@ -168,22 +168,30 @@
<Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
- <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0" />
+ <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
<Reference Include="Microsoft.VisualStudio.Html.Package">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\assemblies\Microsoft.VisualStudio.Html.Package.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
- <Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
<Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.JSON.Package">
<HintPath>..\assemblies\Microsoft.VisualStudio.JSON.Package.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=14.0.0.0" />
+ <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
<Reference Include="Microsoft.VisualStudio.LanguageServices">
<HintPath>..\packages\Microsoft.VisualStudio.LanguageServices.1.0.0-rc1\lib\net45\Microsoft.VisualStudio.LanguageServices.dll</HintPath>
<Private>False</Private>
@@ -192,18 +200,24 @@
<HintPath>..\assemblies\Microsoft.VisualStudio.ProjectSystem.Utilities.v14.0.dll</HintPath>
<Private>False</Private>
</Reference>
- <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0" />
+ <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
- <Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0" />
- <Reference Include="Microsoft.VisualStudio.Text.Internal, Version=14.0.0.0">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\assemblies\Microsoft.VisualStudio.Text.Internal.dll</HintPath>
+ <Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Text.UI, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=14.0.0.0">
+ <Private>False</Private>
</Reference>
- <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=14.0.0.0" />
- <Reference Include="Microsoft.VisualStudio.Text.UI, Version=14.0.0.0" />
- <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=14.0.0.0" />
<Reference Include="Microsoft.VisualStudio.Web, Version=14.0.0.0" />
<Reference Include="Microsoft.VisualStudio.Web.Extensions">
<HintPath>..\assemblies\Microsoft.VisualStudio.Web.Extensions.dll</HintPath>
@@ -230,38 +244,74 @@
</Reference>
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>False</EmbedInteropTypes>
+ <Private>False</Private>
</Reference>
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>False</EmbedInteropTypes>
+ <Private>False</Private>
</Reference>
<Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>False</EmbedInteropTypes>
+ <Private>False</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Practices.TransientFaultHandling.Core">
<HintPath>..\packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.JSLS, Version=14.0.0.0" />
- <Reference Include="Microsoft.VisualStudio.Language.StandardClassification, Version=14.0.0.0" />
- <Reference Include="Microsoft.VisualStudio.TextManager.Interop.12.0" />
+ <Reference Include="Microsoft.VisualStudio.Language.StandardClassification, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TextManager.Interop.12.0">
+ <Private>False</Private>
+ </Reference>
<Reference Include="Microsoft.VisualBasic" />
- <Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0" />
- <Reference Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces, Version=14.0.0.0" />
+ <Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0">
<EmbedInteropTypes>False</EmbedInteropTypes>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Web.BrowserLink.12.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Editor, Version=14.0.0.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.OLE.Interop">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TextManager.Interop">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0">
+ <Private>False</Private>
</Reference>
- <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0" />
- <Reference Include="Microsoft.VisualStudio.Web.BrowserLink.12.0" />
- <Reference Include="Microsoft.VisualStudio.Editor, Version=14.0.0.0" />
- <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
- <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
- <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
- <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
- <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />
- <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
- <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
- <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" />
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.7.0.1-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -270,6 +320,7 @@
<Reference Include="System" />
<Reference Include="System.Collections">
<HintPath>..\packages\System.Collections.4.0.10-beta-22605\lib\net45\System.Collections.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private>
@@ -310,12 +361,11 @@
</Reference>
<Reference Include="System.Runtime">
<HintPath>..\packages\System.Runtime.4.0.20-beta-22605\lib\net45\System.Runtime.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Web" />
- <Reference Include="System.Web.Extensions" />
- <Reference Include="System.Web.Helpers" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
@@ -432,7 +482,6 @@
<Compile Include="HTML\Completion\AriaIdCompletion.cs" />
<Compile Include="HTML\Completion\AureliaCompletion.cs" />
<Compile Include="HTML\Completion\Filters\MsApplicationCompletion.cs" />
- <Compile Include="HTML\Completion\JsxCompletion.cs" />
<Compile Include="HTML\LightBulbs\Actions\AngularControllerLightBulbAction.cs" />
<Compile Include="HTML\LightBulbs\Actions\Base64DecodeLightBulbAction.cs" />
<Compile Include="HTML\LightBulbs\Actions\ExtractLightBulbAction.cs" />
@@ -34,7 +34,7 @@ namespace MadsKristensen.EditorExtensions
[SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling"), PackageRegistration(UseManagedResourcesOnly = true)]
public sealed class WebEssentialsPackage : Package
{
- public const string Version = "0.2";
+ public const string Version = "0.5";
private static DTE2 _dte;
private static IVsRegisterPriorityCommandTarget _pct;
@@ -5,6 +5,12 @@
"DefaultIconMoniker"="KnownMonikers.Git"
[$RootKey$\ShellFileAssociations\.gitattributes]
"DefaultIconMoniker"="KnownMonikers.Git"
+[$RootKey$\ShellFileAssociations\.gitmodules]
+"DefaultIconMoniker"="KnownMonikers.Git"
+
+// TFS
+[$RootKey$\ShellFileAssociations\.tfignore]
+"DefaultIconMoniker"="KnownMonikers.TeamFoundationServer"
// Markdown
[$RootKey$\ShellFileAssociations\.md]
@@ -54,10 +60,6 @@
[$RootKey$\ShellFileAssociations\.lsc]
"DefaultIconMoniker"="KnownMonikers.FSScript"
-// JSX
-[$RootKey$\ShellFileAssociations\.jsx]
-"DefaultIconMoniker"="KnownMonikers.JSScript"
-
// Config files
[$RootKey$\ShellFileAssociations\.jshintrc]
"DefaultIconMoniker"="KnownMonikers.JSONScript"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit d2bda8d

Please sign in to comment.