conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
/// Looks up a localized string similar to 动画路径.
=======
/// 查找类似 添加项 的本地化字符串。
/// </summary>
public static string AddItem {
get {
return ResourceManager.GetString("AddItem", resourceCulture);
}
}
/// <summary... |
<<<<<<<
public static readonly string NotifyIconDemoCtl = nameof(NotifyIconDemoCtl);
=======
public static readonly string BadgeDemoCtl = nameof(BadgeDemoCtl);
public static readonly string GravatarDemoCtl = nameof(GravatarDemoCtl);
public static readonly string DialogDemoCtl = n... |
<<<<<<<
=======
namespace Android.Gms.Games.Request
{
}
>>>>>>>
<<<<<<<
=======
namespace Android.Gms.Games.Quest
{
}
namespace Android.Gms.Games.Video
{
}
>>>>>>> |
<<<<<<<
using System.Web.Routing;
using Glimpse.Core2.Extensibility;
=======
using Glimpse.Core.Extensibility;
>>>>>>>
using System.Web.Routing;
using Glimpse.Core.Extensibility;
<<<<<<<
/// <summary>
/// PipelineInspector which will replace any routes in the route table
/// with a proxied version (fr... |
<<<<<<<
RouteHashCode = invocationTarget.GetHashCode();
RouteName = routeName;
=======
RouteHashCode = routeHashCode;
>>>>>>>
RouteHashCode = routeHashCode;
RouteName = routeName; |
<<<<<<<
=======
using System.Linq;
using System.Reflection;
using System.Text;
>>>>>>>
using System.Linq;
using System.Reflection;
using System.Text;
<<<<<<<
context.TabStore.Setup(x => x.Contains(typeof(IList<ITimerResultMessage>).AssemblyQualifiedName)).Returns(true);
context.TabStore.Setu... |
<<<<<<<
public void SendGiveItem(int id, int pokemon)
{
string toSend = "{|.|/giveitem " + pokemon + "," + id;
SendPacket(toSend);
}
=======
public void SendTakeItem(int pokemon)
{
string toSend = "{|.|/takeitem " + pokemon;... |
<<<<<<<
public event Action<string> LogMessage;
private const string Version = "Sinnoh";
=======
private const string Version = "Spooky";
>>>>>>>
public event Action<string> LogMessage;
private const string Version = "Spooky"; |
<<<<<<<
if (boleto.Carteira.Equals("17-019") || boleto.Carteira.Equals("17-027") || boleto.Carteira.Equals("17-035"))
_segmentoP += "7";
else
_segmentoP += "0";
=======
if (boleto.ModalidadeCobranca == 0) {
if ... |
<<<<<<<
AuthenticationOptions = new FileAuthenticationOptions();
=======
HttpHandlerOptions = new FileHttpHandlerOptions();
>>>>>>>
AuthenticationOptions = new FileAuthenticationOptions();
HttpHandlerOptions = new FileHttpHandlerOptions();
<<<<<<<
public FileA... |
<<<<<<<
public ReRouteBuilder WithAuthenticationProviderKey(string authenticationProviderKey)
{
_authenticationProviderKey = authenticationProviderKey;
return this;
}
=======
public ReRouteBuilder WithHttpHandlerOptions(HttpHandlerOptions input)
{
... |
<<<<<<<
private int _exceptionsAllowedBeforeBreaking;
private int _durationOfBreak;
private int _timeoutValue;
=======
private string _loadBalancer;
private string _serviceProviderHost;
private int _serviceProviderPort;
>>>>>>>
private int _exceptionsAllowedBef... |
<<<<<<<
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Ocelot.Errors;
using Ocelot.Infrastructure.RequestData;
using Ocelot.Logging;
using Ocelot.Middleware;
namespace Ocelot.Responder.Middleware
{
/// <summary>
/// Completes and returns the request and r... |
<<<<<<<
Func<HostAndPort> downstreamHostAndPortFunc = () => new HostAndPort(reRoute.DownstreamHost.Trim('/'), reRoute.DownstreamPort);
=======
//note - not sure if this is the correct key, but this is probably the only unique key i can think of given my poor brain
var loadBalancerK... |
<<<<<<<
if (!DoesVirtualDirectoryExist(site))
{
result.AddAlert("'{0}' doesn't exist. creating.", VirtualDirectoryPath);
CreateVirtualDirectory(site, iisManager);
result.AddGood("'{0}' was created", VirtualDirectoryPath);
}
... |
<<<<<<<
ce.RegisterFunction("COT", 1, Cot);
=======
ce.RegisterFunction("CSCH", 1, Csch);
>>>>>>>
ce.RegisterFunction("COT", 1, Cot);
ce.RegisterFunction("CSCH", 1, Csch);
<<<<<<<
private static object Cot(List<Expression> p)
{
var tan = (d... |
<<<<<<<
return string.Format("inline void {0} ({1} {2}, {3} {4}, out {5} {6})", GetFunctionName(),
ConvertConcreteSlotValueTypeToString(precision, FindInputSlot<MaterialSlot>(InputSlot1Id).concreteValueType), argIn1,
ConvertConcreteSlotValueTypeToString(precision, FindInput... |
<<<<<<<
/// <summary>
/// Sample implementation of a token cache which persists tokens specific to a user to Redis to be used in multi-tenanted scenarios
/// the key is the users object unique object identifier.
/// </summary>
=======
// sample implementation of a token cache which persists tokens... |
<<<<<<<
private static string _clientId;
private static string[] _initScopes = new string[0];
private static Api[] _initApis = new Api[0];
private static readonly string[] DefaultScopes = new []
{
Scopes.Profile
};
=======
private static s... |
<<<<<<<
if (extension == null) throw new ArgumentException("Empty extension is not supported.");
=======
if (extension == null) throw new Exception("Empty extension is not supported.");
extension = extension.Substring(1).ToLowerInvariant();
>>>>>>>
if (extension == n... |
<<<<<<<
=======
player.transform.LookAt(new Vector3(mousePos.x, player.transform.position.y, mousePos.z));
>>>>>>>
player.transform.LookAt(new Vector3(mousePos.x, player.transform.position.y, mousePos.z)); |
<<<<<<<
using System;
namespace NuGetPe
{
public static class Constants
{
internal const string PackageServiceEntitySetName = "Packages";
internal const string PackageRelationshipNamespace = "http://schemas.microsoft.com/packaging/2010/07/";
public static readonly string PackageExtensi... |
<<<<<<<
=======
private void OnPackageRowDetailsLoaded(object sender, RoutedEventArgs e)
{
// align the nested ListView's columns with the parent DataGrid's columns
var packageRowDetails = (PackageRowDetails)sender;
packageRowDetails.ApplyBindings(PackageGrid);
... |
<<<<<<<
[assembly: AssemblyVersion("2.0.0")]
[assembly: AssemblyFileVersion("2.0.0")]
[assembly: AssemblyInformationalVersion("2.0.0-alpha-0002")]
[assembly: AssemblyCopyright("Copyright © 2013-2016 Patrick Lioi")]
=======
[assembly: AssemblyVersion("1.0.1")]
[assembly: AssemblyFileVersion("1.0.1")]
[assembly: Assemb... |
<<<<<<<
public class BasePage
{
protected readonly IApp app;
protected readonly bool OnAndroid;
protected readonly bool OniOS;
protected Func<AppQuery, AppQuery> Trait;
protected BasePage()
{
app = AppInitializer.App;
OnAndroid = app.GetType() == typeof(AndroidApp);
OniOS = app.GetType() == ty... |
<<<<<<<
Acr.UserDialogs.IProgressDialog progress = null;
if (CrossDeviceInfo.Current.Platform == Plugin.DeviceInfo.Abstractions.Platform.Android ||
CrossDeviceInfo.Current.Platform == Plugin.DeviceInfo.Abstractions.Platform.iOS ||
CrossDeviceInfo.Current.Platfor... |
<<<<<<<
closedXMLFill.BackgroundColor = openXMLFill.PatternFill.BackgroundColor.ToClosedXMLColor(_colorList);
=======
closedXMLFill.BackgroundColor = GetColor(openXMLFill.PatternFill.BackgroundColor);
else
clos... |
<<<<<<<
[TestFixture(Platform.Android)]
[TestFixture(Platform.iOS)]
public abstract class AbstractSetup
{
protected IApp app;
protected Platform platform;
protected bool OnAndroid;
protected bool OniOS;
public AbstractSetup(Platform platform)
{
this.platform = platform;
}
[SetUp]
public... |
<<<<<<<
var typeface = Typeface.CreateFromAsset(Assets, "fonts/Corbert-Regular.otf");
FindViewById<TextView>(Resource.Id.text_app_name).Typeface = typeface;
//When the first screen of the app is launched after user has logged in, initialize the processor that manages connection to ... |
<<<<<<<
Temperature = "N/A";
obdDataProcessor = new OBDDataProcessor();
}
=======
EngineLoad = "N/A";
this.obdDataProcessor = new OBDDataProcessor();
this.obdDataProcessor.OnOBDDeviceDisconnected += ObdDataProcessor_OnOBDDeviceDisconnected;
}
>>>>>... |
<<<<<<<
#if !BACKEND
=======
public DateTime RecordedTimeStamp { get; set; }
public int Rating { get; set; }
>>>>>>>
namespace MyTrips.DataObjects
{
/// <summary>
/// Note that this is the structure that was discussed with Haishi - is subject to change.
/// </summary>
public... |
<<<<<<<
using System;
using System.Drawing;
namespace ClosedXML.Excel
{
public enum XLColorType
{
Color,
Theme,
Indexed
}
public enum XLThemeColor
{
Background1,
Text1,
Background2,
Text2,
Accent1,
Accent2,
Accent3,
... |
<<<<<<<
ICommand startTrackingTripCommand;
public ICommand StartTrackingTripCommand =>
startTrackingTripCommand ?? (startTrackingTripCommand = new RelayCommand(async () => await ExecuteStartTrackingTripCommandAsync()));
public async Task ExecuteStartTrackingTripCommandAsync ()
{
if(IsBusy |... |
<<<<<<<
private static readonly string _defaultCopyrightWord = "Copyright";
private static readonly string _symbolLower = "(c)";
private static readonly string _symbolUpper = "(C)";
private readonly AssemblyCopyrightAttribute attribute;
/// <summary>
/// Initializes a ne... |
<<<<<<<
var preprocessorErrors = (
argumentsList.Any()
? argumentsList.Preprocess(PreprocessorGuards.Lookup(nameComparer))
: Enumerable.Empty<Error>()
).Memorize();
=======
var preprocessorErrors = arguments.Any()
... |
<<<<<<<
: MatchVerb(tokenizer, verbs, arguments, nameComparer, ignoreValueCase, parsingCulture, nonFatalErrors);
=======
: MatchVerb(tokenizer, verbs, arguments, nameComparer, parsingCulture, autoHelp, autoVersion, nonFatalErrors);
>>>>>>>
: Mat... |
<<<<<<<
firstDay = firstDay.Date;
lastDay = lastDay.Date;
if (firstDay > lastDay)
return -BusinessDaysUntil(lastDay, firstDay, bankHolidays);
=======
return DateTime.Now;
}
>>>>>>>
return DateTime.Now;
}
<<<<<<<
=======
... |
<<<<<<<
[Test]
public void AttributeNamespaceTest()
{
const string expectedResult =
@"<w:font w:name=""Arial"" xmlns:w=""http://example.com/namespace"" />";
var serializer = new YAXSerializer(typeof(AttributeWithNamespace), YAXExceptionHandlingPolicies.DoNotThrow, YAXExce... |
<<<<<<<
[TestMethod]
public void AttributeForClassTest()
{
AttributeContainerSample container = new AttributeContainerSample
{
Range = new AttributeSample
{
From = 1,
To = 3,
}
... |
<<<<<<<
return HttpHelper.Post<Dictionary<string, object>, string>(
string.Format("/templates/{0}.json", clientID), null,
new Dictionary<string, object>()
{
{ "Name", name },
{ "HtmlPageURL", htmlPageUrl },
... |
<<<<<<<
using ClosedXML.Excel;
using ClosedXML.Excel.CalcEngine;
=======
using ClosedXML.Excel;
>>>>>>>
using ClosedXML.Excel;
using ClosedXML.Excel.CalcEngine; |
<<<<<<<
if (CodeScannerThread != null)
{
Stop(true);
}
=======
decodeInterrupted = false;
>>>>>>>
if (CodeScannerThread != null)
{
Stop(true);
}
decodeInterrupted = false;
<<<<<<<
CodeScannerThread.Abort();
CodeScannerThread = null;
=======
decodeInterrupted ... |
<<<<<<<
// This file is part of Silk.NET.
//
// You may modify and distribute Silk.NET under the terms
// of the MIT license. See the LICENSE file for details.
using System;
using Silk.NET.Core.Platform;
using Silk.NET.Input.Common;
using Silk.NET.Input.Desktop;
using Silk.NET.Windowing.Common;
namespace Silk.NET.In... |
<<<<<<<
differentialFormat.Append(GetNewFont(new FontInfo { Font = cf.Style.Value.Font }, false));
=======
var diffFont = GetNewFont(new FontInfo { Font = cf.Style.Font as XLFont }, false);
if (diffFont?.HasChildren ?? false)
differentialFormat.Append(diffFont);
... |
<<<<<<<
=======
#region OpenedFile
static Dictionary<FileName, OpenedFile> openedFileDict = new Dictionary<FileName, OpenedFile>();
/// <summary>
/// Gets a collection containing all currently opened files.
/// The returned collection is a read-only copy of the currently opened files -
/// it will not ... |
<<<<<<<
else
NewLine();
=======
} else {
if (!(clause is QueryContinuationClause))
NewLine();
}
>>>>>>>
else
if (!(clause is QueryContinuationClause))
NewLine(); |
<<<<<<<
public void FindReferencesInFile(SearchScope searchScope, CSharpParsedFile parsedFile, CompilationUnit compilationUnit, ITypeResolveContext context)
=======
/// <param name="callback">Callback used to report the references that were found.</param>
public void FindReferencesInFile(IFindReferenceSearchSco... |
<<<<<<<
SetSearchOptions();
if (lastResult != null) {
ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
=======
SetSearchOptions(monitor);
if (lastResult != null && WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
ITextEditorControlP... |
<<<<<<<
string directory = Path.Combine(PropertyService.ConfigDirectory, "preferences");
string fileName = projectFileName.Substring(3).Replace('/', '.').Replace('\\', '.').Replace(Path.DirectorySeparatorChar, '.');
string fullFileName = Path.Combine(directory, fileName + ".xml");
return fullFileName;
====... |
<<<<<<<
new ClassNode(Project, c).AddTo(path);
=======
new ClassNode(project, c.GetCompoundClass()).AddTo(path);
>>>>>>>
new ClassNode(Project, c.GetCompoundClass()).AddTo(path);
<<<<<<<
TreeNode node = GetNodeByPath(c.Namespace, true);
new ClassNode(Project, c).AddTo(node);
=======
... |
<<<<<<<
configurations["Debug|*"]["BaseIntermediateOutputPath"] = @"obj\";
configurations["Debug|*"]["IntermediateOutputPath"] = @"obj\Debug\";
configurations["Debug|*"]["OutputPath"] = @"bin\Debug\";
=======
if (information.CreateProjectWithDefaultOutputPath) {
configurations["Debug|*"]["OutputPath"]... |
<<<<<<<
[Test]
public void XmlElement()
{
TestStatement("Dim xml = <Test />",
@"var xml = new XElement(""Test"");");
}
[Test]
public void XmlElement2()
{
TestStatement(@"Dim xml = <Test name=""test"" name2=<%= testVal %> />",
@"var xml = new XElement(""Test"",... |
<<<<<<<
/// <summary>
/// For non-English locales, the default style ("Normal" in English) can be
/// another piece of text (e.g. Обычный in Russian).
/// This test ensures that the default style is correctly detected and
/// no style conflicts occur on save.
/// </summa... |
<<<<<<<
PermanentAnchor position;
bool hasLocation;
string contextMenuAddInTreeEntry = DefaultContextMenuAddInTreeEntry;
=======
int line;
int column;
string contextMenuAddInTreeEntry;
>>>>>>>
PermanentAnchor position;
bool hasLocation;
string contextMenuAddInTreeEntry; |
<<<<<<<
/// <summary>
/// Unloads the specified project content, causing it to be reloaded when
/// GetProjectContentForReference is called the next time.
/// Warning: do not unload project contents that are still in use! Doing so will result
/// in an ObjectDisposedException when the unloaded project content... |
<<<<<<<
marker.MarkerTypes = TextMarkerTypes.SquigglyUnderline;
marker.ForegroundColor = item.Foreground;
marker.BackgroundColor = item.Background;
=======
marker.MarkerType = TextMarkerType.SquigglyUnderline;
marker.MarkerColor = item.Foreground;
>>>>>>>
marker.Marker... |
<<<<<<<
/// <summary>
/// Gets if tabs should be converted to spaces.
/// </summary>
bool ConvertTabsToSpaces { get; }
/// <summary>
/// Gets the size of an indentation level.
/// </summary>
int IndendationSize { get; }
=======
/// <summary>
/// Gets whether a '}' should automatically be ... |
<<<<<<<
/// <summary>
/// Gets the highlighting definition that is being used.
/// </summary>
IHighlightingDefinition HighlightingDefinition { get; }
/// <summary>
/// Adds an additional highlighting engine that runs in addition to the XSHD-based highlighting.
/// </summary>
void AddAdditionalHigh... |
<<<<<<<
Get<Button>("findAll").Click += FindAllButtonClicked;
=======
this.ParentForm.AcceptButton = Get<Button>("findNext");
>>>>>>>
Get<Button>("findAll").Click += FindAllButtonClicked;
this.ParentForm.AcceptButton = Get<Button>("findNext"); |
<<<<<<<
public void TestYieldAsIdentifier()
{
ILexer lexer = GenerateLexer(new StringReader("yield"));
Token t = lexer.NextToken();
Assert.AreEqual(Tokens.Yield, t.kind);
Assert.IsTrue(Tokens.IdentifierTokens[t.kind]);
Assert.AreEqual("yield", t.val);
}
[Test]
=======
public void TestIdent... |
<<<<<<<
WriteKeyword ("__arglist");
=======
WriteKeyword("__arglist");
>>>>>>>
WriteKeyword ("__arglist");
<<<<<<<
StartNode (namedArgumentExpression);
WriteIdentifier (namedArgumentExpression.Identifier);
WriteToken (":", NamedArgumentExpression.Roles.Colon);
Space ();
namedArgumentExpres... |
<<<<<<<
using System.Collections.Generic;
=======
using System.IO;
using System.Text;
using System.Collections;
using System.Drawing;
using System.Diagnostics;
>>>>>>>
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Collections;
using System.Drawing;
using System.Diagnostics; |
<<<<<<<
public override object Control {
=======
/// <summary>
/// Returns the ProfilerView of this instance.
/// </summary>
public ProfilerView DataView {
get { return dataView; }
}
/// <summary>
/// The <see cref="System.Windows.Forms.Control"/> representing the view
/// </summary>
public ... |
<<<<<<<
foreach(var assembly in GacInterop.GetGacAssemblyFullNames()) {
if (assembly.ShortName == "Microsoft.Web.Administration") {
webAdministrationAssembly = Assembly.Load(assembly.FullName);
break;
=======
foreach(DomAssemblyName assembly in GacInterop.GetAssemblyList()) {
... |
<<<<<<<
#line 2763 "VBNET.ATG"
=======
#line 2757 "VBNET.ATG"
>>>>>>>
#line 2765 "VBNET.ATG"
<<<<<<<
#line 2765 "VBNET.ATG"
=======
#line 2759 "VBNET.ATG"
>>>>>>>
#line 2767 "VBNET.ATG"
<<<<<<<
#line 2769 "VBNET.ATG"
=======
#line 2763 "VBNET.ATG"
>>>>>>>
#line 2771 "VBNET.ATG"
<<<<<<<
#li... |
<<<<<<<
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Linq;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.PackageManagement.EnvDTE;
... |
<<<<<<<
[CLSCompliant(false)]
=======
[NonSerialized]
>>>>>>>
[CLSCompliant(false)]
[NonSerialized] |
<<<<<<<
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Linq;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop;
namespace I... |
<<<<<<<
/// <summary>
/// Gets the project content associated with this project.
/// </summary>
/// <remarks>
/// This property must always return the same value for the same project.
/// This property may return null.
///
/// This member is thread-safe.
/// </remarks>
IProjectContent ProjectCon... |
<<<<<<<
if (createKey.ShowDialog(WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
keyFile.Text = createKey.KeyFile;
=======
if (createKey.ShowDialog(WorkbenchSingleton.MainForm) == DialogResult.OK) {
keyFile.Text = MSBuildInternals.Escape(createKey.KeyFile);
>>>>>>>
if (createKey.... |
<<<<<<<
foreach (IUnresolvedTypeDefinition c in SearchClasses(text)) {
AddItem(c, GetMatchType(text, c.Name));
=======
foreach (IClass c in SearchClasses(text)) {
AddItem(c, GetMatchType(text, c.Name), false);
>>>>>>>
foreach (IUnresolvedTypeDefinition c in SearchClasses(text)) {
AddItem(c... |
<<<<<<<
using ICSharpCode.SharpDevelop.Parser;
=======
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Util;
>>>>>>>
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.SharpDevelop.Util; |
<<<<<<<
var start = document.GetLocation(result.Offset);
var end = document.GetLocation(result.EndOffset);
return new AvalonEditSearchResultMatch(file, start, end, result.Offset, result.Length, null, result);
=======
var start = document.OffsetToPosition(result.Offset);
var end = document.Off... |
<<<<<<<
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.SharpDevelop.Refactoring;
=======
>>>>>>>
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.SharpDevelop.Refactoring; |
<<<<<<<
foreach (SDBookmark bookmark in GetBookmarks(editor.FileName)) {
=======
WorkbenchSingleton.AssertMainThread();
foreach (SDBookmark bookmark in GetBookmarks(new FileName(editor.FileName))) {
>>>>>>>
WorkbenchSingleton.AssertMainThread();
foreach (SDBookmark bookmark in GetBookmarks(editor.File... |
<<<<<<<
if (projectBehavior != null)
return projectBehavior;
CppProjectBehavior behavior = new CppProjectBehavior(this, new DotNetStartBehavior(this, new DefaultProjectBehavior(this)));
projectBehavior = ProjectBehaviorService.LoadBehaviorsForProject(this, behavior);
return projectBehavior;
}
pub... |
<<<<<<<
if (this.loader == null || !this.loader.Loading) {
shouldUpdateSelectableObjects = true;
}
=======
bool loading = this.loader != null && this.loader.Loading;
LoggingService.Debug("Forms designer: Component added/removed/renamed, Loading=" + loading + ", Unloading=" + this.unloading);
if (!loa... |
<<<<<<<
public override string GetDefaultNamespace(string fileName)
{
// use root namespace everywhere, ignore the folder name
return this.RootNamespace;
}
public override System.CodeDom.Compiler.CodeDomProvider CreateCodeDomProvider()
{
return new Microsoft.VisualBasic.VBCodeProvider();
}
... |
<<<<<<<
readonly CSharpFormattingOptionsPersistence persistenceHelper;
bool isDirty;
=======
readonly CSharpFormattingPolicy formattingPolicy;
>>>>>>>
readonly CSharpFormattingPolicy formattingPolicy;
bool isDirty;
<<<<<<<
this.persistenceHelper = persistenceHelper;
this.isDirty = false;
=======
... |
<<<<<<<
=======
using System.Linq;
using ICSharpCode.SharpDevelop.Internal.Templates;
>>>>>>>
using System.Linq; |
<<<<<<<
OnPropertyChanged();
=======
UpdateClassGenerationModifier();
base.RaisePropertyChanged(() => SelectedModifier);
>>>>>>>
UpdateClassGenerationModifier();
OnPropertyChanged();
<<<<<<<
generateAsyncOperations = value;
OnPropertyChanged();
=======
options.GenerateAsyncOperatio... |
<<<<<<<
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.... |
<<<<<<<
args.LogicalPosition = pos.Value;
=======
args.LogicalPosition = AvalonEditDocumentAdapter.ToLocation(pos.Value.Location);
>>>>>>>
args.LogicalPosition = pos.Value.Location;
<<<<<<<
throw new NotImplementedException();
//Core.AnalyticsMonitorService.TrackFeature(typeof(GoToDefinition).Fu... |
<<<<<<<
using ICSharpCode.SharpDevelop.Parser;
=======
using ICSharpCode.SharpDevelop.Widgets.MyersDiff;
>>>>>>>
using ICSharpCode.SharpDevelop.Parser;
using ICSharpCode.SharpDevelop.Widgets.MyersDiff; |
<<<<<<<
#region Format-Message
string header = (data == null || data.Length < 1) ? "0:" : data.Length + ":";
var headerBytes = Encoding.UTF8.GetBytes(header);
int messageLen = headerBytes.Length;
if (data != null && data.Length > 0) mess... |
<<<<<<<
using System.Linq.Expressions;
=======
using System.Reflection;
>>>>>>>
using System.Reflection;
using System.Linq.Expressions;
<<<<<<<
private void DebuggingUI(HDRenderPipeline renderContext)
{
EditorGUILayout.LabelField(styles.debugging);
// Global debug parameters... |
<<<<<<<
=======
private string title = string.Empty;
public const string TitlePropertyName = "Title";
/// <summary>
/// Gets or sets the "Title" property
/// </summary>
/// <value>The title.</value>
public string Title
{
get { return title; }
set { SetProperty (ref title, val... |
<<<<<<<
private static readonly Regex s_frameworkVersionRegex = new Regex("(?<=Version=v)[\\d.]+");
private readonly Project _project;
=======
public Project Project { get; }
>>>>>>>
private static readonly Regex s_frameworkVersionRegex = new Regex("(?<=Version=v)[\\d.]+");
pu... |
<<<<<<<
Content = "AppEngine";
Icon = s_icon.Value;
=======
// TODO: Set the icon for AppEngine.
Content = "AppEngine";
// Show the items for the AppEngine hierarchy, to show first the loading message
// then the items once they are ... |
<<<<<<<
using System.Threading.Tasks;
=======
>>>>>>>
using System.Threading.Tasks; |
<<<<<<<
using GoogleCloudExtension.CloudExplorer;
=======
using GoogleCloudExtension.Analytics;
using GoogleCloudExtension.AppEngineApps;
>>>>>>>
using GoogleCloudExtension.CloudExplorer;
using GoogleCloudExtension.Analytics; |
<<<<<<<
using Microsoft.Toolkit.Uwp.Input.Gaze;
using System;
=======
using Microsoft.Toolkit.Uwp.Input.GazeInteraction;
>>>>>>>
using Microsoft.Toolkit.Uwp.Input.GazeInteraction;
using System; |
<<<<<<<
private const string GameFrameworkVersion = "3.0.1";
private static readonly IDictionary<string, Type> s_AssemblyGameFrameworkModules = new Dictionary<string, Type>();
=======
private const string GameFrameworkVersion = "3.0.0.p1";
>>>>>>>
private const string GameFrameworkVer... |
<<<<<<<
=======
public string pretext;
public string text;
>>>>>>>
<<<<<<<
public string pretext;
public string author_name;
public string author_link;
public string author_icon;
public string title;
public string title_link;
public string text... |
<<<<<<<
this.userClient = new Lazy<SlackSocketClient>(() => this.GetClient(this.Config.UserAuthToken));
this.botClient = new Lazy<SlackSocketClient>(() => this.GetClient(this.Config.BotAuthToken));
this.userClientAsync = new Lazy<SlackTaskClient>(() => new SlackTaskClient(this.Config... |
<<<<<<<
PrintedUpgradeIcons.Add(Upgrade.UpgradeType.Torpedoes);
PrintedUpgradeIcons.Add(Upgrade.UpgradeType.Torpedoes);
=======
PrintedUpgradeIcons.Add(Upgrade.UpgradeType.Astromech);
PrintedUpgradeIcons.Add(Upgrade.UpgradeType.Torpedo);
... |
<<<<<<<
public List<Bombs.BombDropTemplates> GetAvailableBombDropTemplates()
{
List<Bombs.BombDropTemplates> availableTemplates = new List<Bombs.BombDropTemplates>() { Bombs.BombDropTemplates.Straight1 };
if (OnGetAvailableBombDropTemplates != null) OnGetAvailableBombDropTemplat... |
<<<<<<<
using GSoft.Dynamite.Caching;
using GSoft.Dynamite.Catalogs;
using GSoft.Dynamite.Configuration;
=======
using GSoft.Dynamite.Caml;
>>>>>>>
using GSoft.Dynamite.Caching;
using GSoft.Dynamite.Caml;
using GSoft.Dynamite.Catalogs;
using GSoft.Dynamite.Configuration;
<<<<<<<
using Microsoft.Office.Server.Search... |
<<<<<<<
_autoSuggestBox.CharacterReceived -= AutoSuggestBox_CharacterReceived;
_autoSuggestBox.PointerEntered -= AutoSuggestBox_PointerEntered;
_autoSuggestBox.PointerExited -= AutoSuggestBox_PointerExited;
_autoSuggestBox.PointerCanceled -= AutoSuggestBox... |
<<<<<<<
var parentScope = this.containerProvider.CurrentSite;
var scopeKindTag = SPLifetimeTag.Web;
var childScopePerContainerUniqueKey = SPLifetimeTag.Web + SPContext.Current.Web.ID;
=======
var parentScope = this.ContainerProvider.CurrentSite;
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.