Skip to content

Commit f2cb36d

Browse files
author
Paul van Brenk
committed
Merge branch 'master' into ctiIssues
2 parents fd141e3 + 9bd8694 commit f2cb36d

File tree

10 files changed

+14
-219
lines changed

10 files changed

+14
-219
lines changed

‎Nodejs/Product/Nodejs/Commands/OpenRemoteDebugDocumentationCommand.cs‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎Nodejs/Product/Nodejs/Commands/OpenRemoteDebugProxyFolderCommand.cs‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎Nodejs/Product/Nodejs/Commands/SendFeedbackCommand.cs‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎Nodejs/Product/Nodejs/Commands/ShowDocumentationCommand.cs‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎Nodejs/Product/Nodejs/Nodejs.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,7 @@
227227
<Compile Include="ClassifierProviderMetadata.cs" />
228228
<Compile Include="Commands\AzureExplorerAttachDebuggerCommand.cs" />
229229
<Compile Include="Commands\ImportWizardCommand.cs" />
230-
<Compile Include="Commands\SendFeedbackCommand.cs" />
231230
<Compile Include="Commands\OpenReplWindowCommand.cs" />
232-
<Compile Include="Commands\OpenRemoteDebugDocumentationCommand.cs" />
233-
<Compile Include="Commands\OpenRemoteDebugProxyFolderCommand.cs" />
234-
<Compile Include="Commands\ShowDocumentationCommand.cs" />
235231
<Compile Include="Debugger\DebugEngine\AD7EvalErrorProperty.cs" />
236232
<Compile Include="Debugger\NodeDebugProvider.cs" />
237233
<Compile Include="ImportWizardResources.Designer.cs">
@@ -541,6 +537,7 @@
541537
</EmbeddedResource>
542538
<VSCTCompile Include="NodejsTools.vsct">
543539
<ResourceName>Menus.ctmenu</ResourceName>
540+
<SubType>Designer</SubType>
544541
</VSCTCompile>
545542
<Compile Include="Resources.Designer.cs">
546543
<AutoGen>True</AutoGen>

‎Nodejs/Product/Nodejs/NodejsPackage.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,7 @@ protected override void Initialize()
117117
// Add our command handlers for menu (commands must exist in the .vsct file)
118118
var commands = new List<Command> {
119119
new OpenReplWindowCommand(),
120-
new OpenRemoteDebugProxyFolderCommand(),
121-
new OpenRemoteDebugDocumentationCommand(),
122120
new ImportWizardCommand(),
123-
new SendFeedbackCommand(),
124-
new ShowDocumentationCommand()
125121
};
126122

127123
try

‎Nodejs/Product/Nodejs/NodejsTools.vsct‎

Lines changed: 9 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,23 @@
2121
group as the part of a menu contained between two lines. The parent of a group
2222
must be a menu. -->
2323
<Groups>
24-
<!-- Our group of menu items which is displayed on Tools/NodeJS Tools/... -->
25-
<Group guid="guidNodeToolsCmdSet" id="ToolsMenuItemsGroup" priority="0x0500">
26-
<Parent guid="guidNodeToolsCmdSet" id="ToolsMenu"/>
27-
</Group>
28-
2924
<!-- Group on normal project items -->
3025
<Group guid="guidNodeToolsCmdSet" id="CodeFileGroup" priority="0x600">
3126
<Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_PROJECT"/>
3227
</Group>
3328

34-
<!-- Our group of menu items which is displayed on Tools/NodeJS Tools/Remote Debugging Proxy/... -->
35-
<Group guid="guidNodeToolsCmdSet" id="RemoteDebugProxyGroup" priority="0x0500">
36-
<Parent guid="guidNodeToolsCmdSet" id="RemoteDebugProxyMenu"/>
37-
</Group>
38-
39-
<Group guid="guidNodeToolsCmdSet" id="NtvsHelpGroup" priority="0x0500">
40-
<Parent guid="guidNodeToolsCmdSet" id="ToolsMenu"/>
41-
</Group>
42-
4329
<Group guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJWIN_SCOPE" priority="0x0500">
4430
<Parent guid="guidNodeToolsNpmCmdSet" id="NpmMenu"/>
4531
</Group>
46-
32+
4733
<Group guid="guidNodeToolsNpmCmdSet" id="NpmGroup" priority="0x0600">
4834
<Parent guid="guidNodeToolsNpmCmdSet" id="NpmMenu"/>
4935
</Group>
50-
36+
5137
<Group guid="guidNodeToolsNpmCmdSet" id="NpmExploreGroup" priority="0x0700">
5238
<Parent guid="guidNodeToolsNpmCmdSet" id="NpmMenu"/>
5339
</Group>
54-
40+
5541
<Group guid="guidSHLMainMenu" id="IDG_VS_MNUDES_PROPERTIES" priority="0x0800">
5642
<Parent guid="guidNodeToolsNpmCmdSet" id="NpmMenu"/>
5743
</Group>
@@ -62,21 +48,6 @@
6248
</Groups>
6349

6450
<Menus>
65-
<Menu guid="guidNodeToolsCmdSet" id="ToolsMenu" priority="0x8009" type="Menu">
66-
<Parent guid="guidSHLMainMenu" id="IDG_VS_TOOLS_OTHER2"/>
67-
<Strings>
68-
<ButtonText>Node.&amp;js Tools</ButtonText>
69-
<CommandName>Node.&amp;js Tools</CommandName>
70-
</Strings>
71-
</Menu>
72-
73-
<Menu guid="guidNodeToolsCmdSet" id="RemoteDebugProxyMenu" priority="0x0500" type="Menu">
74-
<Parent guid="guidNodeToolsCmdSet" id="ToolsMenuItemsGroup"/>
75-
<Strings>
76-
<ButtonText>&amp;Remote Debugging Proxy</ButtonText>
77-
<CommandName>&amp;Remote Debugging Proxy</CommandName>
78-
</Strings>
79-
</Menu>
8051
<Menu guid="guidNodeToolsNpmCmdSet" id="NpmMenu" priority="0x0600" type="Context">
8152
<Strings>
8253
<ButtonText>&amp;Npm</ButtonText>
@@ -94,7 +65,7 @@
9465
<CommandFlag>DefaultInvisible</CommandFlag>
9566
<CommandFlag>DynamicVisibility</CommandFlag>
9667
If you do not want an image next to your command, remove the Icon node or set it to <Icon guid="guidOfficeIcon" id="msotcidNoIcon" /> -->
97-
68+
9869
<Button guid="guidNodeToolsCmdSet" id="cmdidAddNewFileCommand" priority="0x0550" type="Button">
9970
<Parent guid="guidNodeToolsCmdSet" id="AddNewFileGroup"/>
10071
<CommandFlag>DynamicVisibility</CommandFlag>
@@ -103,7 +74,7 @@
10374
<ButtonText>New File...</ButtonText>
10475
</Strings>
10576
</Button>
106-
77+
10778
<Button guid="guidNodeToolsCmdSet" id="cmdidSetAsNodejsStartupFile" priority="0x0300" type="Button">
10879
<Parent guid="guidNodeToolsCmdSet" id="CodeFileGroup"/>
10980
<CommandFlag>DynamicVisibility</CommandFlag>
@@ -126,8 +97,8 @@
12697
</Button>
12798

12899
<Button guid="guidNodeToolsCmdSet" id="cmdidOpenCommandPromptHere" priority="0x0600" type="Button">
129-
<Icon guid="guidCommandPromptImage" id="1" />
130100
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_FOLDER_EXPLORE"/>
101+
<Icon guid="guidCommandPromptImage" id="1" />
131102
<CommandFlag>DefaultInvisible</CommandFlag>
132103
<CommandFlag>DynamicVisibility</CommandFlag>
133104
<Strings>
@@ -155,7 +126,7 @@
155126
<ButtonText>Node.js Interactive Window</ButtonText>
156127
</Strings>
157128
</Button>
158-
129+
159130
<Button guid="guidNodeToolsCmdSet" id="cmdidOpenReplWindow" priority="0x0600" type="Button">
160131
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD"/>
161132
<Icon guid="guidReplImage" id="1"/>
@@ -167,38 +138,6 @@
167138
</Strings>
168139
</Button>
169140

170-
<Button guid="guidNodeToolsCmdSet" id="cmdidOpenRemoteDebugProxyFolder" priority="0x0500" type="Button">
171-
<Parent guid="guidNodeToolsCmdSet" id="RemoteDebugProxyGroup"/>
172-
<Strings>
173-
<CommandName>Open Containing Folder</CommandName>
174-
<ButtonText>&amp;Open Containing Folder</ButtonText>
175-
</Strings>
176-
</Button>
177-
178-
<Button guid="guidNodeToolsCmdSet" id="cmdidOpenRemoteDebugDocumentation" priority="0x0510" type="Button">
179-
<Parent guid="guidNodeToolsCmdSet" id="RemoteDebugProxyGroup"/>
180-
<Strings>
181-
<CommandName>Open Documentation</CommandName>
182-
<ButtonText>Open &amp;Documentation</ButtonText>
183-
</Strings>
184-
</Button>
185-
186-
<Button guid="guidNodeToolsCmdSet" id="cmdidDocumentation" priority="0x004" type="Button">
187-
<Parent guid="guidNodeToolsCmdSet" id="NtvsHelpGroup"/>
188-
<Strings>
189-
<ButtonText>&amp;Documentation...</ButtonText>
190-
<CommandName>Documentation...</CommandName>
191-
</Strings>
192-
</Button>
193-
194-
<Button guid="guidNodeToolsCmdSet" id="cmdidSendFeedback" priority="0x006" type="Button">
195-
<Parent guid="guidNodeToolsCmdSet" id="NtvsHelpGroup"/>
196-
<Strings>
197-
<ButtonText>&amp;Report Issue or Send Feedback...</ButtonText>
198-
<CommandName>Report Issue or Send Feedback...</CommandName>
199-
</Strings>
200-
</Button>
201-
202141
<Button guid="guidNodeToolsNpmCmdSet" id="cmdidNpmManageModules" priority="0x8000" type="Button">
203142
<Parent guid="guidNodeToolsNpmCmdSet" id="NpmGroup" />
204143
<CommandFlag>DefaultInvisible</CommandFlag>
@@ -259,27 +198,6 @@
259198
</Strings>
260199
</Button>
261200

262-
<Button guid="guidNodeToolsNpmCmdSet" id="cmdidNpmOpenModuleHomepage" priority="0x8370" type="Button">
263-
<Parent guid="guidNodeToolsNpmCmdSet" id="NpmExploreGroup" />
264-
<CommandFlag>DefaultInvisible</CommandFlag>
265-
<CommandFlag>DynamicVisibility</CommandFlag>
266-
<Strings>
267-
<CommandName>cmdidNpmOpenModuleHomepage</CommandName>
268-
<ButtonText>Open &amp;Documentation</ButtonText>
269-
</Strings>
270-
</Button>
271-
272-
<Button guid="guidNodeToolsCmdSet" id="cmdidImportWizard" priority="0x010" type="Button">
273-
<Parent guid="guidNodeToolsCmdSet" id="ToolsMenuItemsGroup"/>
274-
<CommandFlag>DefaultInvisible</CommandFlag>
275-
<Strings>
276-
<ButtonText>Import Existing &amp;Project...</ButtonText>
277-
<MenuText>Import Existing &amp;Project...</MenuText>
278-
<ToolTipText>Import Existing Project...</ToolTipText>
279-
<CommandName>Import Existing Project...</CommandName>
280-
</Strings>
281-
</Button>
282-
283201
<Button guid="guidNodeToolsCmdSet" id="cmdidAzureExplorerAttachNodejsDebugger" priority="0x0110" type="Button">
284202
<Parent guid="guidAzureExplorerCmdId" id="groupAzureDiagnostics"/>
285203
<CommandFlag>DefaultInvisible</CommandFlag>
@@ -325,9 +243,6 @@
325243
<CommandPlacement guid="guidNodeToolsCmdSet" id="CodeFileGroup" priority="0x600">
326244
<Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_WEBITEMNODE"/>
327245
</CommandPlacement>
328-
<CommandPlacement guid="guidNodeToolsCmdSet" id="cmdidReplWindow" priority="0x102">
329-
<Parent guid="guidNodeToolsCmdSet" id="ToolsMenuItemsGroup"/>
330-
</CommandPlacement>
331246
</CommandPlacements>
332247

333248
<KeyBindings>
@@ -343,31 +258,21 @@
343258
<GuidSymbol name="guidNodeToolsCmdSet" value="{695e37e2-c6df-4e0a-8833-f688e4c65f1f}">
344259
<IDSymbol name="cmdidReplWindow" value="0x200" />
345260
<IDSymbol name="cmdidOpenReplWindow" value="0x201" />
346-
<IDSymbol name="cmdidOpenRemoteDebugProxyFolder" value="0x0202" />
347261
<IDSymbol name="cmdidSetAsNodejsStartupFile" value="0x0203" />
348262
<IDSymbol name="cmdidImportWizard" value ="0x0205" />
349-
<IDSymbol name="cmdidOpenRemoteDebugDocumentation" value="0x0206" />
263+
350264
<IDSymbol name="cmdidAzureExplorerAttachNodejsDebugger" value="0x0207" />
351265
<IDSymbol name="cmdidAddNewFileCommand" value="0x0211" />
352-
<IDSymbol name="cmdidSendFeedback" value="0x0215" />
353-
<IDSymbol name="cmdidDocumentation" value="0x0216" />
354266

355267
<!-- Shared commands, defined in CommonConstants.cs -->
356268
<IDSymbol name="cmdidAddExistingFolder" value="0x10001" />
357269
<IDSymbol name="cmdidOpenCommandPromptHere" value="0x10002" />
358270
<IDSymbol name="cmdidCopyFullPath" value="0x10003" />
359271

360272
<!-- Groups -->
361-
<IDSymbol name="ToolsMenuItemsGroup" value="0x1010" />
362-
<IDSymbol name="RemoteDebugProxyGroup" value="0x1011" />
363273
<IDSymbol name="CodeFileGroup" value="0x1012" />
364274
<IDSymbol name="AzureExplorerCommandsGroup" value="0x1015" />
365275
<IDSymbol name="AddNewFileGroup" value="0x1016"/>
366-
<IDSymbol name="NtvsHelpGroup" value="0x1017" />
367-
368-
<!-- Menus -->
369-
<IDSymbol name="ToolsMenu" value ="0x2001" />
370-
<IDSymbol name="RemoteDebugProxyMenu" value ="0x2002" />
371276
</GuidSymbol>
372277

373278
<GuidSymbol name="guidNodeToolsNpmCmdSet" value="{9F4B31B4-09AC-4937-A2E7-F4BC02BB7DBA}">
@@ -384,7 +289,7 @@
384289

385290
<IDSymbol name="NpmMenu" value="0x3000"/>
386291
</GuidSymbol>
387-
292+
388293
<GuidSymbol name="guidCommandPromptImage" value="{6CFD0EC5-3818-4439-AC50-71365BD2A756}" />
389294
<GuidSymbol name="guidReplImage" value="{31C0C4BE-487E-4CCB-BEA2-A2EE8D23EDBB}" />
390295

‎Nodejs/Product/Nodejs/PkgCmdId.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@
22

33
namespace Microsoft.NodejsTools
44
{
5-
internal class PkgCmdId
5+
internal static class PkgCmdId
66
{
77
public const int cmdidReplWindow = 0x200;
88
public const int cmdidOpenReplWindow = 0x201;
9-
public const int cmdidOpenRemoteDebugProxyFolder = 0x202;
109
public const int cmdidSetAsNodejsStartupFile = 0x203;
1110

1211
public const int cmdidImportWizard = 0x205;
13-
public const int cmdidOpenRemoteDebugDocumentation = 0x206;
14-
12+
1513
public const uint cmdidAzureExplorerAttachNodejsDebugger = 0x207;
1614

1715
public const int cmdidDiagnostics = 0x208;
1816
public const int cmdidAddFileCommand = 0x211;
19-
public const int cmdidSendFeedback = 0x215;
20-
public const int cmdidShowDocumentation = 0x216;
2117

2218
public const int cmdidNpmManageModules = 0x300;
2319
public const int cmdidNpmInstallModules = 0x301;

‎Nodejs/Product/TestAdapterShim/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
[assembly: AssemblyConfiguration("")]
99

1010
[assembly: ComVisible(false)]
11-
//[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.TestAdapter", CodeBase = "Microsoft.NodejsTools.TestAdapter.dll", Version = "1.0.0.0")]
11+
//[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.TestAdapter", CodeBase = "Microsoft.NodejsTools.TestAdapter.dll", Version = "1.0.0.0")]

‎Nodejs/Product/TestAdapterShim/ShimTestDiscoverer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ public void DiscoverTests(IEnumerable<string> sources, IDiscoveryContext discove
2424
this.testDiscoverer.DiscoverTests(sources, discoveryContext, logger, discoverySink);
2525
}
2626
}
27-
}
27+
}

0 commit comments

Comments
 (0)