Skip to content
Merged
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
31 changes: 0 additions & 31 deletions Nodejs/Product/Nodejs/EditFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
using Microsoft.NodejsTools.Editor.Core;
using Microsoft.NodejsTools.Formatting;
using Microsoft.NodejsTools.Intellisense;
using Microsoft.NodejsTools.Outlining;
using Microsoft.NodejsTools.Project;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.ComponentModelHost;
Expand Down Expand Up @@ -80,7 +79,6 @@ public int Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pv
// disable JavaScript language services auto formatting features, this is because
// they are not aware that we have an extra level of indentation
if (pguidCmdGroup == VSConstants.VSStd2K) {
JavaScriptOutliningTaggerProvider.OutliningTagger tagger;
switch ((VSConstants.VSStd2KCmdID)nCmdID) {
case VSConstants.VSStd2KCmdID.FORMATSELECTION: FormatSelection(); return VSConstants.S_OK;
case VSConstants.VSStd2KCmdID.FORMATDOCUMENT: FormatDocument(); return VSConstants.S_OK;
Expand Down Expand Up @@ -135,20 +133,6 @@ _intellisenseStack.TopSession is ICompletionSession &&
return VSConstants.S_OK;
}
break;
case VSConstants.VSStd2KCmdID.OUTLN_STOP_HIDING_ALL:
tagger = _textView.GetOutliningTagger();
if (tagger != null) {
tagger.Disable();
}
// let VS get the event as well
break;
case VSConstants.VSStd2KCmdID.OUTLN_START_AUTOHIDING:
tagger = _textView.GetOutliningTagger();
if (tagger != null) {
tagger.Enable();
}
// let VS get the event as well
break;
}
} else if (pguidCmdGroup == VSConstants.GUID_VSStandardCommandSet97) {
switch ((VSConstants.VSStd97CmdID)nCmdID) {
Expand Down Expand Up @@ -679,7 +663,6 @@ public int QueryStatus(ref Guid pguidCmdGroup, uint cCmds, OLECMD[] prgCmds, Int
}
}
} else if (pguidCmdGroup == VSConstants.VSStd2K) {
JavaScriptOutliningTaggerProvider.OutliningTagger tagger;
for (int i = 0; i < cCmds; i++) {
switch ((VSConstants.VSStd2KCmdID)prgCmds[i].cmdID) {
case VSConstants.VSStd2KCmdID.FORMATDOCUMENT:
Expand All @@ -697,20 +680,6 @@ public int QueryStatus(ref Guid pguidCmdGroup, uint cCmds, OLECMD[] prgCmds, Int
case VSConstants.VSStd2KCmdID.UNCOMMENTBLOCK:
prgCmds[i].cmdf = (uint)(OLECMDF.OLECMDF_ENABLED | OLECMDF.OLECMDF_SUPPORTED);
return VSConstants.S_OK;

case VSConstants.VSStd2KCmdID.OUTLN_STOP_HIDING_ALL:
tagger = _textView.GetOutliningTagger();
if (tagger != null && tagger.Enabled) {
prgCmds[i].cmdf = (uint)(OLECMDF.OLECMDF_ENABLED | OLECMDF.OLECMDF_SUPPORTED);
}
return VSConstants.S_OK;

case VSConstants.VSStd2KCmdID.OUTLN_START_AUTOHIDING:
tagger = _textView.GetOutliningTagger();
if (tagger != null && !tagger.Enabled) {
prgCmds[i].cmdf = (uint)(OLECMDF.OLECMDF_ENABLED | OLECMDF.OLECMDF_SUPPORTED);
}
return VSConstants.S_OK;
}
}
}
Expand Down
1 change: 0 additions & 1 deletion Nodejs/Product/Nodejs/Nodejs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@
<Compile Include="Options\SalsaLsIntellisenseOptionsControl.Designer.cs">
<DependentUpon>SalsaLsIntellisenseOptionsControl.cs</DependentUpon>
</Compile>
<Compile Include="Outlining\JavaScriptOutliningTaggerProvider.cs" />
<Compile Include="Project\AzureToolsContracts.cs" />
<Compile Include="Project\NewFileMenuGroup\NewFileUtilities.cs" />
<Compile Include="Project\NewFileMenuGroup\NewFileNameForm.cs">
Expand Down
260 changes: 0 additions & 260 deletions Nodejs/Product/Nodejs/Outlining/JavaScriptOutliningTaggerProvider.cs

This file was deleted.