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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 17 additions & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Do not normalize line endings from CR LF to LF, regardless of core.autocrlf.
* -text

# Normalize C# source files to use CR LF line endings.
*.cs text eol=crlf
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Denote all files that are truly binary and should not be modified.
*.bmp binary
*.png binary
*.ico binary
*.chm binary
*.cub binary
*.dll binary
*.eot binary
*.exe binary
*.msi binary
*.snk binary
*.sqlite binary
*.wixlib binary
*.woff binary
50 changes: 25 additions & 25 deletions Common/Product/ReplWindow/GlobalSuppressions.cs
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
/* ****************************************************************************
*
* Copyright (c) Microsoft Corporation.
*
* This source code is subject to terms and conditions of the Apache License, Version 2.0. A
* copy of the license can be found in the License.html file at the root of this distribution. If
* you cannot locate the Apache License, Version 2.0, please send an email to
* vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound
* by the terms of the Apache License, Version 2.0.
*
* You must not remove this notice, or any other, from this software.
*
* ***************************************************************************/
// This file is used by Code Analysis to maintain SuppressMessage
// attributes that are applied to this project. Project-level
// suppressions either have no target or are given a specific target
// and scoped to a namespace, type, member, etc.
//
// To add a suppression to this file, right-click the message in the
// Error List, point to "Suppress Message(s)", and click "In Project
// Suppression File". You do not need to add suppressions to this
// file manually.
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1017:MarkAssembliesWithComVisible")]
/* ****************************************************************************
*
* Copyright (c) Microsoft Corporation.
*
* This source code is subject to terms and conditions of the Apache License, Version 2.0. A
* copy of the license can be found in the License.html file at the root of this distribution. If
* you cannot locate the Apache License, Version 2.0, please send an email to
* vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound
* by the terms of the Apache License, Version 2.0.
*
* You must not remove this notice, or any other, from this software.
*
* ***************************************************************************/

// This file is used by Code Analysis to maintain SuppressMessage
// attributes that are applied to this project. Project-level
// suppressions either have no target or are given a specific target
// and scoped to a namespace, type, member, etc.
//
// To add a suppression to this file, right-click the message in the
// Error List, point to "Suppress Message(s)", and click "In Project
// Suppression File". You do not need to add suppressions to this
// file manually.

[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1017:MarkAssembliesWithComVisible")]
66 changes: 33 additions & 33 deletions Common/Product/ReplWindow/Guids.cs
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
/* ****************************************************************************
*
* Copyright (c) Microsoft Corporation.
*
* This source code is subject to terms and conditions of the Apache License, Version 2.0. A
* copy of the license can be found in the License.html file at the root of this distribution. If
* you cannot locate the Apache License, Version 2.0, please send an email to
* vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound
* by the terms of the Apache License, Version 2.0.
*
* You must not remove this notice, or any other, from this software.
*
* ***************************************************************************/
// Guids.cs
// MUST match guids.h
using System;
#if NTVS_FEATURE_INTERACTIVEWINDOW
namespace Microsoft.NodejsTools.Repl {
#else
namespace Microsoft.VisualStudio.Repl {
#endif
static class Guids {
#if NTVS_FEATURE_INTERACTIVEWINDOW
public const string guidReplWindowPkgString = "29102E6C-34F2-4FF1-BA2F-C02ADE3846E8";
public const string guidReplWindowCmdSetString = "220C57E5-228F-46B5-AF80-D0AB55A44902";
#else
public const string guidReplWindowPkgString = "ce8d8e55-ad29-423e-aca2-810d0b16cdc4";
public const string guidReplWindowCmdSetString = "68cb76e6-98c5-464a-aba9-9f2db66fa0fd";
#endif
public static readonly Guid guidReplWindowCmdSet = new Guid(guidReplWindowCmdSetString);
};
/* ****************************************************************************
*
* Copyright (c) Microsoft Corporation.
*
* This source code is subject to terms and conditions of the Apache License, Version 2.0. A
* copy of the license can be found in the License.html file at the root of this distribution. If
* you cannot locate the Apache License, Version 2.0, please send an email to
* vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound
* by the terms of the Apache License, Version 2.0.
*
* You must not remove this notice, or any other, from this software.
*
* ***************************************************************************/

// Guids.cs
// MUST match guids.h
using System;

#if NTVS_FEATURE_INTERACTIVEWINDOW
namespace Microsoft.NodejsTools.Repl {
#else
namespace Microsoft.VisualStudio.Repl {
#endif
static class Guids {
#if NTVS_FEATURE_INTERACTIVEWINDOW
public const string guidReplWindowPkgString = "29102E6C-34F2-4FF1-BA2F-C02ADE3846E8";
public const string guidReplWindowCmdSetString = "220C57E5-228F-46B5-AF80-D0AB55A44902";
#else
public const string guidReplWindowPkgString = "ce8d8e55-ad29-423e-aca2-810d0b16cdc4";
public const string guidReplWindowCmdSetString = "68cb76e6-98c5-464a-aba9-9f2db66fa0fd";
#endif
public static readonly Guid guidReplWindowCmdSet = new Guid(guidReplWindowCmdSetString);
};
}
74 changes: 37 additions & 37 deletions Common/Product/ReplWindow/PkgCmdID.cs
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
/* ****************************************************************************
*
* Copyright (c) Microsoft Corporation.
*
* This source code is subject to terms and conditions of the Apache License, Version 2.0. A
* copy of the license can be found in the License.html file at the root of this distribution. If
* you cannot locate the Apache License, Version 2.0, please send an email to
* vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound
* by the terms of the Apache License, Version 2.0.
*
* You must not remove this notice, or any other, from this software.
*
* ***************************************************************************/
// PkgCmdID.cs
// MUST match PkgCmdID.h
#if NTVS_FEATURE_INTERACTIVEWINDOW
namespace Microsoft.NodejsTools.Repl {
#else
namespace Microsoft.VisualStudio.Repl {
#endif
static class PkgCmdIDList {
public const uint cmdidSmartExecute = 0x103;
public const uint cmdidBreakRepl = 0x104;
public const uint cmdidResetRepl = 0x105;
public const uint cmdidReplHistoryNext = 0x0106;
public const uint cmdidReplHistoryPrevious = 0x0107;
public const uint cmdidReplClearScreen = 0x0108;
public const uint cmdidBreakLine = 0x0109;
public const uint cmdidReplSearchHistoryNext = 0x010A;
public const uint cmdidReplSearchHistoryPrevious = 0x010B;
public const uint menuIdReplToolbar = 0x2000;
public const uint comboIdReplScopes = 0x3000;
public const uint comboIdReplScopesGetList = 0x3001;
};
/* ****************************************************************************
*
* Copyright (c) Microsoft Corporation.
*
* This source code is subject to terms and conditions of the Apache License, Version 2.0. A
* copy of the license can be found in the License.html file at the root of this distribution. If
* you cannot locate the Apache License, Version 2.0, please send an email to
* vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound
* by the terms of the Apache License, Version 2.0.
*
* You must not remove this notice, or any other, from this software.
*
* ***************************************************************************/

// PkgCmdID.cs
// MUST match PkgCmdID.h

#if NTVS_FEATURE_INTERACTIVEWINDOW
namespace Microsoft.NodejsTools.Repl {
#else
namespace Microsoft.VisualStudio.Repl {
#endif
static class PkgCmdIDList {
public const uint cmdidSmartExecute = 0x103;
public const uint cmdidBreakRepl = 0x104;
public const uint cmdidResetRepl = 0x105;
public const uint cmdidReplHistoryNext = 0x0106;
public const uint cmdidReplHistoryPrevious = 0x0107;
public const uint cmdidReplClearScreen = 0x0108;
public const uint cmdidBreakLine = 0x0109;
public const uint cmdidReplSearchHistoryNext = 0x010A;
public const uint cmdidReplSearchHistoryPrevious = 0x010B;
public const uint menuIdReplToolbar = 0x2000;

public const uint comboIdReplScopes = 0x3000;
public const uint comboIdReplScopesGetList = 0x3001;
};
}
118 changes: 59 additions & 59 deletions Common/Product/ReplWindow/Repl/Commands/CancelExecutionCommand.cs
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
/* ****************************************************************************
*
* Copyright (c) Microsoft Corporation.
*
* This source code is subject to terms and conditions of the Apache License, Version 2.0. A
* copy of the license can be found in the License.html file at the root of this distribution. If
* you cannot locate the Apache License, Version 2.0, please send an email to
* vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound
* by the terms of the Apache License, Version 2.0.
*
* You must not remove this notice, or any other, from this software.
*
* ***************************************************************************/
using System;
using System.ComponentModel.Composition;
using System.Reflection;
using System.Threading.Tasks;
using System.Windows.Controls;
using System.Windows.Media.Imaging;
#if NTVS_FEATURE_INTERACTIVEWINDOW
namespace Microsoft.NodejsTools.Repl {
#else
namespace Microsoft.VisualStudio.Repl {
#endif
[Export(typeof(IReplCommand))]
class CancelExecutionCommand : IReplCommand {
#region IReplCommand Members
public Task<ExecutionResult> Execute(IReplWindow window, string arguments) {
window.AbortCommand();
return ExecutionResult.Succeeded;
}
public string Description {
get { return "Stops execution of the current command."; }
}
public string Command {
get { return null; }
}
public object ButtonContent {
get {
var image = new BitmapImage();
image.BeginInit();
image.StreamSource = Assembly.GetExecutingAssembly().GetManifestResourceStream("Microsoft.VisualStudio.Resources.CancelEvaluation.gif");
image.EndInit();
var res = new Image();
res.Source = image;
res.Width = res.Height = 16;
return res;
}
}
#endregion
}
}
/* ****************************************************************************
*
* Copyright (c) Microsoft Corporation.
*
* This source code is subject to terms and conditions of the Apache License, Version 2.0. A
* copy of the license can be found in the License.html file at the root of this distribution. If
* you cannot locate the Apache License, Version 2.0, please send an email to
* vspython@microsoft.com. By using this source code in any fashion, you are agreeing to be bound
* by the terms of the Apache License, Version 2.0.
*
* You must not remove this notice, or any other, from this software.
*
* ***************************************************************************/

using System;
using System.ComponentModel.Composition;
using System.Reflection;
using System.Threading.Tasks;
using System.Windows.Controls;
using System.Windows.Media.Imaging;

#if NTVS_FEATURE_INTERACTIVEWINDOW
namespace Microsoft.NodejsTools.Repl {
#else
namespace Microsoft.VisualStudio.Repl {
#endif
[Export(typeof(IReplCommand))]
class CancelExecutionCommand : IReplCommand {
#region IReplCommand Members

public Task<ExecutionResult> Execute(IReplWindow window, string arguments) {
window.AbortCommand();
return ExecutionResult.Succeeded;
}

public string Description {
get { return "Stops execution of the current command."; }
}

public string Command {
get { return null; }
}

public object ButtonContent {
get {
var image = new BitmapImage();
image.BeginInit();
image.StreamSource = Assembly.GetExecutingAssembly().GetManifestResourceStream("Microsoft.VisualStudio.Resources.CancelEvaluation.gif");
image.EndInit();
var res = new Image();
res.Source = image;
res.Width = res.Height = 16;
return res;
}
}

#endregion
}
}
Loading