conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
// OthersTab
//
this.OthersTab.Controls.Add(this.CountryCodeGroup);
this.OthersTab.Controls.Add(this.CountryCodeEnabledCheckbox);
this.OthersTab.Location = new System.Drawing.Point(4, 22);
this.OthersTab.Margin = new System.Windows.Forms.P... |
<<<<<<<
private static List<DataPoint> GetSampleDataForTraining()
{
return new List<DataPoint>()
{
new DataPoint(){ Features = new float[3] {0, 2, 1} , Label = false },
new DataPoint(){ Features = new float[3] {0, 2, 3} , Label = false },
... |
<<<<<<<
/// Reads an exception file from the given file.
/// </summary>
/// <param name="file">The file that contains exception.</param>
/// <returns>An exception instance or null if the file doesn't contain an exception.</returns>
public virtual System.Exception InstanceReadExce... |
<<<<<<<
this.AddToPlaylistCommand = new ReactiveUI.Legacy.ReactiveCommand(this.WhenAnyValue(x => x.SelectedSongs, x => x != null && x.Any()));
=======
this.ApplyOrder(SortHelpers.GetOrderByTitle<T>, ref this.titleOrder);
this.AddToPlaylistCommand = this.WhenAnyValue(x => x.Selecte... |
<<<<<<<
// OthersTab
//
this.OthersTab.Controls.Add(this.CountryCodeGroup);
this.OthersTab.Controls.Add(this.CountryCodeEnabledCheckbox);
this.OthersTab.Location = new System.Drawing.Point(4, 22);
this.OthersTab.Margin = new System.Windows.Forms.P... |
<<<<<<<
MSAnalytics.SetDelegate(new AnalyticsDelegate());
=======
MobileCenterLog.Assert(App.LogTag, "MobileCenter.Configured=" + MobileCenter.Configured);
>>>>>>>
MSAnalytics.SetDelegate(new AnalyticsDelegate());
MobileCenterLog.Assert(App.LogTag, "MobileCenter.Confi... |
<<<<<<<
_storage.DeleteLogsAsync(ChannelName).RunNotAsync();
=======
_storage = new Mobile.Storage.Storage();
_storage.DeleteLogsAsync(ChannelName).Wait();
>>>>>>>
_storage = new Mobile.Storage.Storage();
_storage.DeleteLogsAsync(ChannelName).RunNotAsync(); |
<<<<<<<
/// Sets the app will close callback.
/// </summary>
/// <value>The app will close callback.</value>
public static WillExitAppCallback WillExitApp
{
set
{
SetWillExitAppCallback(value);
}
}
/// <summary>... |
<<<<<<<
// Before deleting logs, allow "InstanceGetLastSessionCrashReportAsync" to complete to avoid a race condition.
InstanceGetLastSessionCrashReportAsync().Wait();
=======
var tasks = new List<Task>();
>>>>>>>
// Before deleting logs, allow "InstanceGetLastSessio... |
<<<<<<<
=======
TCs.Add(new TCDescribe { Title = "TwoButtonPopup", Class = typeof(TCTwoButtonPopup) });
TCs.Add(new TCDescribe { Title = "", Class = null }); // for bottom padding
>>>>>>>
TCs.Add(new TCDescribe { Title = "TwoButtonPopup", Class = typeof(TCTwoButtonPopup) }); |
<<<<<<<
using Moq;
=======
>>>>>>>
using Moq;
<<<<<<<
Task.Run(() => storage.PutLogAsync(StorageTestChannelName, new TestLog()));
Task.Run(() => storage.PutLogAsync(StorageTestChannelName, new TestLog()));
var result = storage.ShutdownAsync(TimeSpan.FromSeconds(100)).RunNotAsync(... |
<<<<<<<
using System.Linq;
using System.Reactive.Linq;
=======
using System.Reactive.Linq;
>>>>>>>
using System.Linq;
using System.Reactive.Linq;
<<<<<<<
this.UpdateSilentlyAsync();
=======
this.SetupLager();
this.SetupMobileApi();
>>>>>>>
this.SetupLager();
... |
<<<<<<<
using Smod2.Permissions;
=======
using Smod2.Piping;
>>>>>>>
using Smod2.Piping;
using Smod2.Permissions; |
<<<<<<<
bits.CopyTo(_bits);
mask.CopyTo(_mask);
=======
Bits = (BitArray) bits.Clone();
Mask = (BitArray) mask.Clone();
}
/// <inheritdoc />
public override void MarkFullyUnknown()
{
Mask.SetAll(false);
>>>>>>>... |
<<<<<<<
=======
using XSharp.Compiler;
using static XSharp.Compiler.XSRegisters;
>>>>>>>
using XSharp.Compiler;
using static XSharp.Compiler.XSRegisters;
<<<<<<<
/*
* Sadly for x86 there is no way using SSE to convert a float to an Int64... in x64 we could use Conv... |
<<<<<<<
WriteError(new ErrorRecord(scriptRuleException, Strings.RuleErrorMessage, ErrorCategory.InvalidOperation, filePath));
continue;
=======
WriteError(new ErrorRecord(scriptRuleException, Strings.RuleError, ErrorCategory.InvalidOp... |
<<<<<<<
AssignmentViewModel.LoadAssignmentsAsync ().ContinueOnUIThread (_ => {
if (AssignmentViewModel.ActiveAssignment != null) {
SetActiveAssignmentVisible (true);
} else {
SetActiveAssignmentVisible (false);
}
... |
<<<<<<<
SetupDevice();
logarithmic = System.Convert.ToBoolean(ConfigSaver.GetAppSettings("logarithmic"));
SaveLogarithmic();
=======
_workerDispatcher.Invoke(SetupDevice);
>>>>>>>
_workerDispatcher.Invoke(SetupDevice);
logarithmic = System.Con... |
<<<<<<<
IEnumerator Start()
{
while (true)
{
while (m_loadQueue.First == null)
yield return null;
m_currentHandle = m_loadQueue.First.Value;
m_loadQueue.RemoveFirst();
m_currentHandle.Start();
... |
<<<<<<<
var parameterName =
elementAttribute?.ElementName ??
info.GetCustomAttribute<MessageParameterAttribute>()?.Name ??
info.ParameterType.GetCustomAttribute<MessageContractAttribute>()?.WrapperName ??
info.Name;
var parameterNs = elementAttribute?.Namespace;
var dataContractAttribute = info... |
<<<<<<<
public static bool Exists(PCIDevice pciDevice)
{
return GetDevice((VendorID)pciDevice.VendorID, (DeviceID)pciDevice.DeviceID) != null;
}
public static bool Exists(VendorID aVendorID, DeviceID aDeviceID)
{
return GetDevice(aVendorID, aDeviceID) != ... |
<<<<<<<
[DefaultValue(Operator.or)]
[ExcelConfig(Description = "Use ball operator between IV and CP ", Position = 634)]
[JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate, Order = 63)]
public Operator UseBallOperator { get; set; }
=... |
<<<<<<<
[JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate, Order = 48)]
public int KeepMinCp{ get; set; }
=======
[JsonProperty(Required = Required.DisallowNull, DefaultValueHandling = DefaultValueHandling.Populate, Order = 49)]
public... |
<<<<<<<
int TotalAmountOfPokebalsToKeep { get; }
int TotalAmountOfPotionsToKeep { get; }
=======
string SnipeLocationServer { get; }
int SnipeLocationServerPort { get; }
bool UseSnipeLocationServer { get; }
bool UseTransferIVForSnipe { get; }
int MinDelayBetween... |
<<<<<<<
using System.Threading;
=======
using System.Runtime.Caching;
>>>>>>>
using System.Threading;
using System.Runtime.Caching;
<<<<<<<
CancellationTokenSource CancellationTokenSource { get; set; }
Queue<AuthConfig> Accounts { get; }
=======
MemoryCache Cache { get; set; }
>>>>>>>
... |
<<<<<<<
else
{
Logging.Logger.Write($"Using ItemRecycleFilter for pokeballs, keeping {amountOfPokeballsToKeep}", Logging.LogLevel.Info, ConsoleColor.Yellow);
}
=======
>>>>>>>
else
{
Logging.Logger.Write("Using ItemRecycleFil... |
<<<<<<<
public bool EvolveAllPokemonAboveIV => UserSettings.Default.EvolveAllPokemonAboveIV;
public float EvolveAboveIVValue => UserSettings.Default.EvolveAboveIVValue;
=======
public bool PrioritizeIVOverCP => UserSettings.Default.PrioritizeIVOverCP;
>>>>>>>
public bool Ev... |
<<<<<<<
public bool AutoUpdate = false;
public string TranslationLanguageCode = "en";
public double DefaultAltitude = 10;
public double DefaultLatitude = 52.379189;
public double DefaultLongitude = 4.899431;
public int DelayBetweenPokemonCatch = 2000;
public floa... |
<<<<<<<
NotEnoughPokeballsToSnipe,
=======
DisplayHighestMOVE1Header,
DisplayHighestMOVE2Header
>>>>>>>
NotEnoughPokeballsToSnipe,
DisplayHighestMOVE1Header,
DisplayHighestMOVE2Header
<<<<<<<
new KeyValuePair<TranslationString, string>(Common.TranslationSt... |
<<<<<<<
private readonly IScriptEngine scriptEngine;
=======
readonly ILog log;
private readonly CombinedScriptEngine scriptEngine;
>>>>>>>
readonly ILog log;
private readonly IScriptEngine scriptEngine;
<<<<<<<
public DeployAzureServiceFabricAppCommand(IScriptEngine ... |
<<<<<<<
public PlanTerraformConvention(ILog log, ICalamariFileSystem fileSystem, string extraParameter = "") : base(log, fileSystem)
=======
public PlanTerraformConvention(ICalamariFileSystem fileSystem, ICommandLineRunner commandLineRunner, string extraParameter = "") : base(fileSystem)
>>>>>>>
... |
<<<<<<<
var runner = new CommandLineRunner(new LogWrapper(), new CalamariVariables());
return new DockerImagePackageDownloader(new ScriptEngine(Enumerable.Empty<IScriptWrapper>()), CalamariPhysicalFileSystem.GetPhysicalFileSystem(), runner, new CalamariVariables());
=======
var run... |
<<<<<<<
var configurationTransformer = ConfigurationTransformer.FromVariables(variables, log);
var transformFileLocator = new TransformFileLocator(fileSystem, log);
var replacer = new ConfigurationVariablesReplacer(variables, log);
var jsonVariableReplacer = new Structure... |
<<<<<<<
private static string[] GetSourceExtensions(RunningDeployment deployment, List<XmlConfigTransformDefinition> transformDefinitions)
{
var extensions = new HashSet<string>();
if (deployment.Variables.GetFlag(SpecialVariables.Package.AutomaticallyRunConfigurationTransformat... |
<<<<<<<
this.displayTimeoutWarning = Observable.Merge(this.LocalViewModel.TimeoutWarning, this.YoutubeViewModel.TimeoutWarning, this.DirectYoutubeViewModel.TimeoutWarning, this.SoundCloudViewModel.TimeoutWarning)
.SelectMany(x => new[] { true, false }.ToObservable())
.ToPrope... |
<<<<<<<
using (var cli = new TerraformCliExecutor(fileSystem, deployment, environmentVariables))
=======
using (var cli = new TerraformCLIExecutor(fileSystem, commandLineRunner, deployment, environmentVariables))
>>>>>>>
using (var cli = new TerraformCliExecutor(fileSystem, comman... |
<<<<<<<
var variables = new VariableDictionary(variablesFile);
var configurationTransformer = new ConfigurationTransformer(variables.GetFlag(SpecialVariables.Package.IgnoreConfigTransformationErrors));
=======
var substituter = new FileSubstituter();
var configurationT... |
<<<<<<<
=======
public event LogDelegate Warning;
private readonly bool suppressWarnings;
private string stdOutMode;
private readonly IndentedTextWriter stdOut;
private readonly IndentedTextWriter stdErr;
public VerboseTransformLogger(bool suppressWarnings = false)
... |
<<<<<<<
var extractor = new GenericPackageExtractorFactory(log).CreateStandardGenericPackageExtractor();
=======
>>>>>>> |
<<<<<<<
public DeployAzureCloudServiceCommand(ILog log, CombinedScriptEngine scriptEngine, IVariables variables)
=======
public DeployAzureCloudServiceCommand(CombinedScriptEngine scriptEngine, IVariables variables, ICommandLineRunner commandLineRunner)
>>>>>>>
public DeployAzureCloudServiceC... |
<<<<<<<
var embeddedResources = new ExecutingAssemblyEmbeddedResources();
=======
var iis = new InternetInformationServer();
>>>>>>>
var embeddedResources = new ExecutingAssemblyEmbeddedResources();
var iis = new InternetInformationServer();
<<<<<<<
ne... |
<<<<<<<
const string StagingDirectory = "c:\\applications\\acme\\1.0.0";
ProxyLog logs;
=======
>>>>>>>
ProxyLog logs;
<<<<<<<
deployment = new RunningDeployment("C:\\packages", variables);
logs = new ProxyLog();
}
[TearDown]
public void TearD... |
<<<<<<<
readonly ICalamariFileSystem fileSystem;
readonly RunningDeployment deployment;
readonly IVariables variables;
=======
private readonly ICalamariFileSystem fileSystem;
readonly ICommandLineRunner commandLineRunner;
private readonly RunningDeployment deployment;
... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Calamari.Commands.Support;
=======
using Calamari.Commands.Support;
>>>>>>>
using System.Collections.Generic;
using Calamari.Commands.Support;
<<<<<<<
Options.Add("variables=", "Path to a JSON file conta... |
<<<<<<<
public TarGzipPackageExtractor(ILog log) : base(log)
{
}
public override string[] Extensions { get { return new[] { ".tgz", ".tar.gz", ".tar.Z" }; } }
=======
public override string[] Extensions => new[] {".tgz", ".tar.gz", ".tar.Z"};
>>>>>>>
public TarGzipPac... |
<<<<<<<
public ApplyTerraformConvention(ILog log, ICalamariFileSystem fileSystem) : base(log, fileSystem)
=======
readonly ICommandLineRunner commandLineRunner;
public ApplyTerraformConvention(ICalamariFileSystem fileSystem, ICommandLineRunner commandLineRunner) : base(fileSystem)
>>>>>>>
... |
<<<<<<<
using (var cli = new TerraformCliExecutor(fileSystem, deployment, environmentVariables))
=======
using (var cli = new TerraformCLIExecutor(fileSystem, commandLineRunner, deployment, environmentVariables))
>>>>>>>
using (var cli = new TerraformCliExecutor(fileSystem, comman... |
<<<<<<<
void ApplyTransformations(string sourceFile, XmlConfigTransformDefinition transformation,
ISet<string> transformFilesApplied, ICollection<XmlConfigTransformDefinition> transformDefinitionsApplied)
=======
void ApplyTransformations(string sourceFile, XmlConfigTransformDefinition t... |
<<<<<<<
Task<CustomerBasket> GetBasketAsync(string customerId);
Task<CustomerBasket> UpdateBasketAsync(CustomerBasket basket);
Task<bool> DeleteBasketAsync(string id);
=======
Task<CustomerBasket> GetBasket(string customerId);
Task<IEnumerable<string>> GetUsers();
Task<... |
<<<<<<<
using System.Data.SqlClient;
using System.IO;
=======
using System.Data.Common;
>>>>>>>
using System.Data.SqlClient;
using System.IO;
using System.Data.Common; |
<<<<<<<
private readonly Mock<IBuyerRepository> _buyerRepositoryMock;
private readonly Mock<IOrderRepository> _orderRepositoryMock;
=======
private readonly Mock<IOrderRepository<Order>> _orderRepositoryMock;
>>>>>>>
private readonly Mock<IOrderRepository> _orderRepositoryMock;
<<<<<... |
<<<<<<<
.AddJsonFile($"settings.json",optional:false)
.AddEnvironmentVariables();
=======
.AddJsonFile($"settings.json", optional: false, reloadOnChange: true)
.AddJsonFile($"settings.{env.EnvironmentName}.json", optional: true);
builder.Add... |
<<<<<<<
if(outlinePolygons.Count == 0)
{
return;
}
OutlinePolygons = Clipper.CleanPolygons(outlinePolygons, avoidInset / 60);
if (!stayInside)
{
var boundary = outlinePolygons.GetBounds();
boundary.Inflate(avoidInset * 4000);
OutlinePolygons = new Polygons(outlinePolygons.Count+1);
... |
<<<<<<<
return instance != null && instance.IsEnabled();
=======
#if PROTOTYPE
return instance != null && !instance.isProOnly && instance.IsEnabled();
#else
return instance != null && instance.enabled;
#endif
>>>>>>>
return instance != null && instance.enabled;
<<<<<<<
return instance != null && inst... |
<<<<<<<
using System.Linq;
=======
using UnityEditor.ProBuilder.Actions;
>>>>>>>
using System.Linq;
using UnityEditor.ProBuilder.Actions;
<<<<<<<
=======
using UnityEditor.ShortcutManagement;
using System.Reflection;
>>>>>>>
using UnityEditor.ShortcutManagement;
using System.Reflection;
<<<<<<<
s_Us... |
<<<<<<<
using System.IO;
=======
using System;
using System.IO;
using UnityEngine;
>>>>>>>
using System.IO;
<<<<<<<
class ProBuilderize : TemporaryAssetTest
{
[Test]
public static void CubeSurvivesRoundTrip()
{
var pb = ShapeGenerator.CreateShape(ShapeType.Cube);
try
{
var dup = new GameObjec... |
<<<<<<<
using UnityEditor.EditorTools;
=======
>>>>>>>
using UnityEditor.EditorTools;
<<<<<<<
#if UNITY_2020_2_OR_NEWER
using EditorToolManager = UnityEditor.EditorTools.EditorToolManager;
using ToolManager = UnityEditor.EditorTools.ToolManager;
#else
using EditorToolManager = UnityEditor.EditorTools.EditorToolCon... |
<<<<<<<
m_OppositeCorner = ray.GetPoint(distance);
var diff = m_OppositeCorner - m_Origin;
m_HeightCorner = m_OppositeCorner;
if (m_Shape != null)
m_Shape.RotateBy(ToEularAngles(diff), true);
... |
<<<<<<<
static List<Edge> s_EdgeBuffer = new List<Edge>(32);
=======
static readonly List<int> s_IndexBuffer = new List<int>(16);
>>>>>>>
static readonly List<int> s_IndexBuffer = new List<int>(16);
static List<Edge> s_EdgeBuffer = new List<Edge>(32);
<<<<<<<
... |
<<<<<<<
using UnityEditor.ShortcutManagement;
#if !UNITY_2019_1_OR_NEWER
=======
>>>>>>>
using UnityEditor.ShortcutManagement; |
<<<<<<<
sb.AppendLine( "\t\t\t{");
sb.AppendLine( "\t\t\t\tEditorUtility.ShowNotification(instance.DoAction().notification);");
sb.AppendLine( "\t\t\t\tProBuilderAnalytics.SendActionEvent(instance, ProBuilderAnalytics.TriggerType.MenuOrShortcut);");
sb.AppendLine( "\t\t\t... |
<<<<<<<
=======
// Read from DF:
public int posXBlock = 0;
public int posYBlock = 0;
public int posXTile = 0;
public int posYTile = 0;
public int posZ = 0;
bool posZDirty = true; // Set in GetViewInfo if z changes, and reset in HideMeshes after meshes hidden.
int map_x;
int map_y;
... |
<<<<<<<
private ushort VBERead(VBERegisterIndex index)
{
IO.VbeIndex.Word = (ushort)index;
return IO.VbeIndex.Word;
}
public bool Available()
{
if (VBERead(VBERegisterIndex.VBEDisplayID) == 0xB0C5)
{
return true;
... |
<<<<<<<
public void InitSSE() { } // Plugged
=======
[PlugMethod(PlugRequired = true)]
>>>>>>>
[PlugMethod(PlugRequired = true)]
public void InitSSE() { } // Plugged
[PlugMethod(PlugRequired = true)] |
<<<<<<<
static bool runningOnWindows, runningOnX11, runningOnOSX, runningOnLinux, runningOnMono;
=======
static bool runningOnWindows, runningOnX11, runningOnMacOS, runningOnLinux;
>>>>>>>
static bool runningOnWindows, runningOnX11, runningOnMacOS, runningOnLinux, runningOnMono;
<<<<<<<
... |
<<<<<<<
Assert.IsTrue(xNumber.Equals(42), "Int32.Equals on boxed int doesn't work!");
Assert.IsFalse(xNumber.Equals(5), "Int32.Equals on boxed int doesn't work!");
=======
object xAnotherNumber = 42;
Assert.IsTrue(xNumber.Equals(42), "Int32 Equals doesn't work!");
... |
<<<<<<<
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using DotLiquid.Exceptions;
using DotLiquid.Util;
namespace DotLiquid
{
/// <summary>
/// Holds variables. Variables are only loaded "just in time"
/// and are not evaluated ... |
<<<<<<<
//while asset is being created, path can't be determined, which throws an exception when setting up the filters
if(string.IsNullOrEmpty(AssetDatabase.GetAssetPath(m_Profile)))
return;
#if UNITY_2019_1_OR_NEWER
Rect viewRect = new Rect( 18, 0, EditorGUIUtility.currentViewWidth-23, EditorGU... |
<<<<<<<
Decimal,
=======
Image,
>>>>>>>
Decimal,
Image, |
<<<<<<<
Log(_options.Exchange.Name, _options.Exchange.Type);
channel.ExchangeDeclare(_options.Exchange.Name, _options.Exchange.Type, _options.Exchange.Durable,
_options.Exchange.AutoDelete);
}
=======
if (_options.Exchange?.Declare == tru... |
<<<<<<<
var properties = _channel.CreateBasicProperties();
properties.Persistent = _persistMessages;
=======
var properties = channel.CreateBasicProperties();
>>>>>>>
var properties = channel.CreateBasicProperties();
properties.Persistent = _persistMessages... |
<<<<<<<
#if !CF
=======
#if !READ_ONLY
#if !CF
>>>>>>>
#if !READ_ONLY
#if !CF
<<<<<<<
#endif
=======
#endif
>>>>>>>
#endif
<<<<<<<
return ReadModule (stream, "", parameters);
}
static ModuleDefinition ReadModule (Stream stream, string fileName, ReaderParameters parameters)
{
CheckStream (stream);
... |
<<<<<<<
#if !SILVERLIGHT && !CF && !NET_CORE
=======
#if !PCL
>>>>>>>
#if !PCL && !NET_CORE
<<<<<<<
#if !SILVERLIGHT && !CF && !NET_CORE
=======
#if !PCL
>>>>>>>
#if !PCL && !NET_CORE |
<<<<<<<
#if !SILVERLIGHT && !READ_ONLY && !NET_CORE
=======
>>>>>>> |
<<<<<<<
Interlocked.CompareExchange (ref assembly_resolver, new AssemblyResolver (), null);
=======
Interlocked.CompareExchange (ref assembly_resolver, new DefaultAssemblyResolver (), null);
#endif
>>>>>>>
Interlocked.CompareExchange (ref assembly_resolver, new AssemblyResolver (), null);
#endif
<<<<... |
<<<<<<<
using (var module = ModuleDefinition.CreateModule ("foo", ModuleKind.Dll)) {
var method = module.Import (generic.GetMethod ("Method"));
Assert.AreEqual ("T Mono.Cecil.Tests.ImportCecilTests/Generic`1::Method(T)", method.FullName);
}
=======
var module = ModuleDefinition.CreateModule ("foo", M... |
<<<<<<<
this.assembly_resolver = new AssemblyResolver ();
=======
>>>>>>>
<<<<<<<
this.fq_name = image.Stream.GetFullyQualifiedName ();
=======
this.characteristics = image.Characteristics;
this.fq_name = image.FileName;
>>>>>>>
this.characteristics = image.Characteristics;
this.fq_name = image... |
<<<<<<<
public async Task TestAndAndOrParenthesized()
=======
public async Task TestOrAndEqualsParenthesized()
{
var testCode = @"public class Foo
{
public void Bar()
{
bool x = true || (false == true);
}
}";
await VerifyCSharpDiagnosticAsync(testCod... |
<<<<<<<
context.RegisterCodeFix(CodeAction.Create("Fix spacing", t => GetTransformedDocument(context.Document, diagnostic, t)), diagnostic);
=======
SyntaxToken token = root.FindToken(diagnostic.Location.SourceSpan.Start);
if (!token.IsKind(SyntaxKind.SemicolonToken))
... |
<<<<<<<
/// <summary>
/// Verifies that attribute list with multiple attributes for (generic) parameters will not produce diagnostics.
/// Regression test for #1882
/// </summary>
/// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
[Fact]
... |
<<<<<<<
context.RegisterCodeFix(CodeAction.Create("Fix spacing", t => GetTransformedDocument(context.Document, root, trivia)), diagnostic);
=======
context.RegisterCodeFix(CodeAction.Create("Insert space", t => GetTransformedDocumentAsync(context.Document, root, trivia)), diagnostic);
... |
<<<<<<<
SA1006PreprocessorKeywordsMustNotBePrecededBySpace.DiagnosticId,
=======
SA1002SemicolonsMustBeSpacedCorrectly.DiagnosticId,
>>>>>>>
SA1002SemicolonsMustBeSpacedCorrectly.DiagnosticId,
SA1006PreprocessorKeywordsMustNotBePrecededBySpace.Diagnosti... |
<<<<<<<
public async Task TestClassWithDocumentation()
{
await this.TestTypeWithSummaryDocumentation("class");
}
[Fact]
public async Task TestStructWithDocumentation()
{
await this.TestTypeWithSummaryDocumentation("struct");
}
[Fa... |
<<<<<<<
=======
public async Task TestEnumWithDocumentation()
{
await this.TestTypeWithDocumentation("enum").ConfigureAwait(false);
}
[Fact]
public async Task TestClassWithDocumentation()
{
await this.TestTypeWithDocumentation("class").Configure... |
<<<<<<<
DiagnosticResult[] expected =
{
new DiagnosticResult
{
Id = "CS0029",
Message = "Cannot implicitly convert type 'int' to 'string'",
Severity = DiagnosticSeverity.Error,
Locatio... |
<<<<<<<
UpdateReplaceMap(replaceMap, token, t => t.WithLeadingTrivia().WithTrailingTrivia(trailingTrivia));
=======
nextToken = token.GetNextToken();
if (nextToken.IsKind(SyntaxKind.SemicolonToken))
{
... |
<<<<<<<
yield return new[] { pair.Item1, pair.Item2 };
yield return new[] { pair.Item1, "System." + pair.Item2 };
yield return new[] { pair.Item1, "global::System." + pair.Item2 };
=======
await func(item.Item1, item.Item2).ConfigureAwait... |
<<<<<<<
using StyleCop.Analyzers.Helpers;
=======
using StyleCop.Analyzers.Helpers;
>>>>>>>
using StyleCop.Analyzers.Helpers;
<<<<<<<
internal const string CodeFixAction = "Action";
internal const string InsertBeforeTag = "InsertBefore";
internal const string RemoveBeforeTag = "... |
<<<<<<<
var document = CreateDocument(oldSource, language);
=======
var document = this.CreateDocument(oldSource, language);
var analyzerDiagnostics = await GetSortedDiagnosticsFromDocumentsAsync(analyzers, new[] { document }, cancellationToken).ConfigureAwait(false);
>>>>>>>
... |
<<<<<<<
await this.VerifyCSharpDiagnosticAsync(string.Format(testCode, typeKeyword), EmptyDiagnosticResults, CancellationToken.None);
=======
await this.VerifyCSharpDiagnosticAsync(string.Format(testCode, "class"), EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
... |
<<<<<<<
using Microsoft.CodeAnalysis.CodeFixes;
using Microsoft.CodeAnalysis.Diagnostics;
=======
>>>>>>>
using Microsoft.CodeAnalysis.CodeFixes;
<<<<<<<
var expectedDiagnostic = this.CSharpDiagnostic().WithLocation(1, 1).WithArguments("XML is invalid.");
await
... |
<<<<<<<
string baseTypeList = ": IInterface";
string baseTypeDeclaration = "public interface IInterface { event EventHandler MemberName; }";
await this.TestNestedDeclarationAsync("private", "MemberName", "event EventHandler IInterface.MemberName", "{ add { } remove { } }", baseTypeLi... |
<<<<<<<
using Cosmos.Debug.Kernel;
=======
using Point = Cosmos.System.Graphics.Point;
>>>>>>>
using Cosmos.Debug.Kernel;
using Point = Cosmos.System.Graphics.Point; |
<<<<<<<
short LimitChildrenCount { get; }
int CurrentConceptGroupId { get; }
int CurrentRootId { get; set; }
int CurrentHookId { get; set; }
int CurrentConceptId { get; }
=======
int CurrentConceptGroupId { get; }
int CurrentRootId { get; set; }
... |
<<<<<<<
using Espera.Core;
using ReactiveUI;
using ReactiveUI.Legacy;
using Splat;
=======
>>>>>>>
using ReactiveUI.Legacy;
using Splat;
<<<<<<<
this.OpenPathCommand = new ReactiveUI.Legacy.ReactiveCommand();
this.OpenPathCommand.Subscribe(x =>
{
try
... |
<<<<<<<
//ensure sendingTime is later than OrigSendingTime, else fail validation and logout
var origSendingTime = msg.Header.GetDateTime(Fields.Tags.OrigSendingTime);
var sendingTime = msg.Header.GetDateTime(Fields.Tags.SendingTime);
=======
>>>>>>>
// Ensure sending... |
<<<<<<<
internal class NameValueCollectionValueGetter : ValueGetter
{
private readonly NameValueCollection _target;
private readonly string _key;
internal NameValueCollectionValueGetter(NameValueCollection target, string key)
{
_target = target;
_key = k... |
<<<<<<<
public delegate Object Lambda<T>(T text);
public delegate Object Lambda();
=======
public delegate Object Lambda(string text, RenderContext context, RenderFunc render);
public delegate string RenderFunc(RenderContext context);
>>>>>>>
public delegate Object Lambda();
public delegate ... |
<<<<<<<
using (socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp))
{
socket.Blocking = Resp;
try
{
while (IsFlooding)
{
FloodCount++;
buf = System.Text.Encoding.ASCII.GetBytes(String.Concat(Data, (AllowRandom ? Functions... |
<<<<<<<
other != null
&& this.ImplementationType.Equals(other.ImplementationType)
&& this.Target.Equals(other.Target);
=======
this.implementationType.Equals(other.implementationType)
&& this.target.Equals(other.target);
>>>>>>>
other != null
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.