conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
sink.TopLevelDeclarations.Add(new Bpl.Axiom(ctor.tok, q, "Inductive seq rank"));
=======
sink.TopLevelDeclarations.Add(new Bpl.Axiom(ctor.tok, q));
>>>>>>>
sink.TopLevelDeclarations.Add(new Bpl.Axiom(ctor.tok, q, "Inductive seq rank"));
<<<<<<<
=======
// Ad... |
<<<<<<<
case "assume": t.kind = 33; break;
case "calc": t.kind = 34; break;
case "case": t.kind = 35; break;
case "then": t.kind = 36; break;
case "else": t.kind = 37; break;
case "as": t.kind = 38; break;
case "decreases": t.kind = 39; break;
case "invariant": t.kind = 40; break;
case "funct... |
<<<<<<<
ResolveAttributes(f.Attributes, f, new ResolveOpts(f, false));
=======
ResolveAttributes(f.Attributes, new ResolveOpts(f, false));
// take care of the warnShadowing attribute
bool warnShadowingOption = DafnyOptions.O.WarnShadowing; // save the original warnShadowing value
bool w... |
<<<<<<<
if (outParams.Count != 0) { // don't create an empty havoc statement
=======
if (outParams.Count != 0)
{ // don't create an empty havoc statement
>>>>>>>
if (outParams.Count != 0) { // don't create an empty havoc statement
{ // don't create an empty havoc statement... |
<<<<<<<
[assembly: AssemblyFileVersion("1.1.20528.0")]
[assembly: AssemblyInformationalVersion("1.1.0-beta1-20528-000")]
[assembly: AssemblyMetadata("Servicing", "true")]
=======
[assembly: AssemblyFileVersion("1.1.20604.0")]
[assembly: AssemblyInformationalVersion("1.1.0-beta2-20604-000")]
>>>>>>>
[assembly: Assemb... |
<<<<<<<
protected override Task ApplyResponseChallenge()
=======
private bool IsHostRelative(string path)
{
if (string.IsNullOrEmpty(path))
{
return false;
}
if (path.Length == 1)
{
return path[0] == '/... |
<<<<<<<
var dataProtecter = app.CreateDataProtector(
typeof(OAuthAuthorizationServerMiddleware).Namespace,
=======
var dataProtecter = app.CreateDataProtecter(
typeof(OAuthBearerAuthenticationMiddleware).Namespace,
>>>>>>>
var da... |
<<<<<<<
[Fact]
public void TryRemoveIfLockIdMatch_NullLockId()
{
ProviderConfiguration pc = Utility.GetDefaultConfigUtility();
using (RedisServer redisServer = new RedisServer())
{
RedisConnectionWrapper redisConn = GetRedisConnectionWrapperWit... |
<<<<<<<
redisConn.TryRemoveAndReleaseLock(lockId);
A.CallTo(() => mockRedisClient.Eval(A<string>.Ignored, A<string[]>.That.Matches(s => s.Length == 3),
=======
redisConn.redisConnection = A.Fake<IRedisClientConnection>();
redisConn.TryRemoveAndReleaseLockI... |
<<<<<<<
LookupSparse = this.lookupSparse,
HashFunctionId = this.hashFunctionId,
=======
LookupSparse = this.lookupSparse,
CountAdditions = this.CountAdditions,
>>>>>>>
LookupSparse = this.lookupSparse,
HashFunctionId = th... |
<<<<<<<
/// <param name="processLurker">The process lurker.</param>
/// <param name="settingsService">The settings service.</param>
/// <param name="keyboard">The keyboard.</param>
public LifeBulbViewModel(IEventAggregator eventAggregator, IWindowManager windowManager, DockingHelper dock... |
<<<<<<<
=======
using Caliburn.Micro;
using Lurker.Helpers;
using Lurker.Patreon.Events;
using Lurker.Services;
using Lurker.UI.Models;
>>>>>>>
<<<<<<<
/// <summary>
/// The default bulb height.
/// </summary>
protected static readonly int DefaultBulbHeight = 220;... |
<<<<<<<
using VirtoCommerce.Storefront.Models;
using VirtoCommerce.Storefront.Owin;
=======
using VirtoCommerce.Storefront.Model;
using VirtoCommerce.Storefront.OwinMiddlewares;
using Microsoft.Practices.Unity;
>>>>>>>
using VirtoCommerce.Storefront.Model;
using VirtoCommerce.Storefront.Owin;
<<<<<<<
v... |
<<<<<<<
private readonly ICacheManager<object> _cacheManager;
=======
private readonly string _baseLocalPath;
private FileSystemWatcher _fileSystemWatcher;
private readonly ILocalCacheManager _cacheManager;
>>>>>>>
private readonly ILocalCacheManager<object> _cacheManager;
<<... |
<<<<<<<
public ContentController(Func<string, IContentBlobStorageProvider> contentStorageProviderFactory, IBlobUrlResolver urlResolver, ISecurityService securityService, IPermissionScopeService permissionScopeService)
=======
private readonly IStoreService _storeService;
public ContentControll... |
<<<<<<<
public class Module : ModuleBase
{
private readonly IUnityContainer _container;
public Module(IUnityContainer container)
{
_container = container;
}
#region IModule Members
public override void Initialize()
{
var settingsManager = _container.Resolve<ISettingsManager>();
var xmlRelati... |
<<<<<<<
}
private ICommerceService GetCommerceService()
{
return new CommerceServiceImpl(() => new CommerceRepositoryImpl("VirtoCommerce", new EntityPrimaryKeyGeneratorInterceptor(), new AuditableInterceptor()));
}
private StoreModuleController GetStoreController()
... |
<<<<<<<
lineItemWebModel.TaxTotal = new Money(currency);
=======
>>>>>>>
<<<<<<<
webModel.DiscountTotal = new Money(serviceModel.DiscountTotal ?? 0, currency);
webModel.ExtendedPrice = new Money(serviceModel.ExtendedPrice ?? 0, currency);
=======
>>>>>>>
<<<<<<<
... |
<<<<<<<
#region IAsyncObserver<QuoteRequestUpdatedEvent> Members
public Task OnNextAsync(QuoteRequestUpdatedEvent quoteRequestCreatedEvent)
{
if (quoteRequestCreatedEvent.QuoteRequest != null)
{
var cacheKey = GetCacheKey(quoteRequestCreatedEvent.QuoteReq... |
<<<<<<<
using (new Utilities.ProfilingSample("Single Pass - Deferred Lighting Pass", renderLoop))
{
// Bind material data
m_LitRenderLoop.Bind();
m_SinglePassLightLoop.RenderDeferredLighting(camera, renderLoop, m_CameraColorBuffer);
... |
<<<<<<<
if (!string.IsNullOrEmpty(language)
&& (!ensureTwoPublishedLanguages || _workContext.CurrentLanguage.Length >= 2)
)
=======
// Get slug for requested language
if (!string.IsNullOrEmpty(language) && _workContext.StoreLanguages.Length >= 2)
>>... |
<<<<<<<
DiscountTotal = new Money(currency);
TaxTotal = new Money(currency);
=======
ListPrice = new Money(currency.Code);
SalePrice = new Money(currency.Code);
>>>>>>>
ListPrice = new Money(currency);
SalePrice = new Money(currency); |
<<<<<<<
using VirtoCommerce.Storefront.Model.Services;
using VirtoCommerce.Storefront.Model.StaticContent;
using VirtoCommerce.LiquidThemeEngine.Extensions;
=======
using VirtoCommerce.Storefront.Model.Services;
>>>>>>>
using VirtoCommerce.Storefront.Model.Services;
using VirtoCommerce.Storefront.Model.StaticContent... |
<<<<<<<
public abstract class ServiceBase
{
#region Settings
protected void LoadObjectSettings(ISettingsManager settingManager, object obj)
{
var haveSettingsObjects = obj.GetFlatObjectsListWithInterface<IHaveSettings>();
foreach (var haveSettingsObject in haveS... |
<<<<<<<
=======
using VirtoCommerce.Foundation.AppConfig.Repositories;
using VirtoCommerce.Foundation.Frameworks.Extensions;
using VirtoCommerce.Platform.Core.Security;
>>>>>>>
using VirtoCommerce.Platform.Core.Security;
<<<<<<<
private readonly IPropertyService _propertyService;
private readonly ISettingsManag... |
<<<<<<<
using System.Web.Http;
=======
using VirtoCommerce.Storefront.Model.Cart.Services;
using VirtoCommerce.Storefront.Model.Pricing.Services;
>>>>>>>
using VirtoCommerce.Storefront.Model.Cart.Services;
using VirtoCommerce.Storefront.Model.Pricing.Services;
<<<<<<<
GlobalConfiguration.Configure(WebAp... |
<<<<<<<
public async Task<ActionResult> CreateOrderJson(BankCardInfo bankCardInfo)
=======
[Route("createorder")]
public async Task<ActionResult> CreateOrderJson(VirtoCommerceDomainPaymentModelBankCardInfo bankCardInfo)
>>>>>>>
public async Task<ActionResult> CreateOrderJson(VirtoComm... |
<<<<<<<
webModel.DiscountTotal = new Money(serviceModel.DiscountTotal ?? 0, currency);
webModel.HandlingTotal = new Money(serviceModel.HandlingTotal ?? 0, currency);
=======
webModel.HandlingTotal = new Money(serviceModel.HandlingTotal ?? 0, currency.Code);
>>>>>>>
... |
<<<<<<<
using PagedList;
using System.Linq;
=======
using System;
using System.Linq;
using System.Web;
using PagedList;
>>>>>>>
using PagedList;
using System.Linq;
using System.Web;
using PagedList; |
<<<<<<<
=======
using VirtoCommerce.Storefront.Controllers.Api;
using VirtoCommerce.Storefront.Model.Common;
>>>>>>>
using VirtoCommerce.Storefront.Controllers.Api;
using VirtoCommerce.Storefront.Model.Common;
<<<<<<<
public static void RegisterRoutes(RouteCollection routes, Func<WorkContext> workContextFac... |
<<<<<<<
PrintVertex curp = new PrintVertex(ActivePath.End.Position, GCodeUtil.UnspecifiedValue, PathDimensions, GCodeUtil.UnspecifiedValue);
newPath.AppendVertex(curp);
=======
PrintVertex curp = new PrintVertex(ActivePath.End.Position, GCodeUtil.UnspecifiedValue, GCodeUtil.UnspecifiedValue);
newPath.... |
<<<<<<<
/// <summary>
/// Event that is fired if the service call fails with an exception.
/// This event is fired for every failed attempt to call the service method.
/// </summary>
event OnExceptionHandler OnException;
=======
/// <summary>
/// Allows access... |
<<<<<<<
_logger?.WriteLine("Disposing WatchableApp");
Process?.Dispose();
Scenario.Dispose();
=======
Process?.Dispose();
Scenario?.Dispose();
>>>>>>>
_logger?.WriteLine("Disposing WatchableApp");
Process?.Dispose();
Scen... |
<<<<<<<
protected static Rect ControlWinPos2 { get; set; }
=======
//protected bool Loaded { get; set; }
protected static Rect ControlWindowPosition { get; set; }
>>>>>>>
protected static Rect ControlWindowPosition { get; set; } |
<<<<<<<
rotationSpeed *= (speedTweak)*customSpeed*(reverse ? -1 : 1);
//rotation += getAxisInversion() * TimeWarp.fixedDeltaTime * speed;
rotation += GetAxisInversion()*TimeWarp.fixedDeltaTime*rotationSpeed*electricChargeConstraintData.Ratio;
RotationChang... |
<<<<<<<
new de4dot.code.deobfuscators.MPRESS.DeobfuscatorInfo(),
=======
new de4dot.code.deobfuscators.Rummage.DeobfuscatorInfo(),
>>>>>>>
new de4dot.code.deobfuscators.MPRESS.DeobfuscatorInfo(),
new de4dot.code.deobfuscators.Rummage.DeobfuscatorInfo(), |
<<<<<<<
cmd.ReleaseTemporaryRT(CameraRenderTargetID.opaque);
cmd.EndSample("LightweightPipeline.Render");
=======
>>>>>>>
cmd.ReleaseTemporaryRT(CameraRenderTargetID.opaque);
<<<<<<<
private RenderTextureDescriptor CreateRTDesc(FrameRenderingConfiguration r... |
<<<<<<<
// Used in Authenticate and Snapshot examples. The client they help create is used by all examples.
// From your Face subscription in the Azure portal, get your subscription key and location/region (for example, 'westus').
=======
// Used in Authenticate and Snapshot examples. The client these help c... |
<<<<<<<
URL ="https://console.ng.bluemix.net/catalog/natural-language-classifier/", ServiceID="NaturalLanguageClassifierV1" },
new ServiceSetup() { ServiceName = "Tone Analyzer", ServiceAPI = "tone-analyzer/api",
URL ="https://console.ng.bluemix.net/catalog/services/tone-analyzer/", Serv... |
<<<<<<<
State = AvatarState.DONT_UNDERSTAND;
m_TextOutput.SendData(new TextData( PickRandomString( m_FailurePhrases ) ));
=======
m_TextOutput.SendData(new TextToSpeechData( PickRandomString( m_FailurePhrases ) ));
>>>>>>>
State = AvatarState.DONT_UNDERSTAND;
m_TextOutput.... |
<<<<<<<
internal GraphQLType GetGQLType(Type type)
=> _types.FirstOrDefault(t => t.CLRType == type)
?? new GraphQLType(type) { IsScalar = true };
=======
internal override GraphQLType GetGQLType(Type type) => GetGQLType(type, _types);
private static GraphQLType GetGQLTy... |
<<<<<<<
AddDefaultPrimitives();
AddType<TContext>("queryType");
=======
>>>>>>>
AddType<TContext>("queryType");
<<<<<<<
var schemaType = AddType<GraphQLSchema<TContext>>("__Schema");
schemaType.AddField("types", (db, s) => s.Types.Concat(VariableTypes.Intr... |
<<<<<<<
var acct =
(IDictionary<string, object>)
gql.ExecuteQuery("{ accountPaidBy(paid: { year: 2016 month: 1 day: 1 }) { id } }")["accountPaidBy"];
Assert.AreEqual(acct["id"], 1);
=======
var results = gql.ExecuteQuery("{ accountPaidBy(paid: \... |
<<<<<<<
#if NETFX45 || CORE
=======
#if NET45
>>>>>>>
#if NET45 || CORE
<<<<<<<
#if NETFX45 || CORE
=======
#if NET45
>>>>>>>
#if NET45 || CORE
<<<<<<<
#if NETFX45 || CORE
/// <summary>
/// Derefence a FtpListItem object
/// </summary>
/// <param name="item">The item to derefence... |
<<<<<<<
get
{
{
return db.Ideas.Count();
}
}
=======
get { return db.Ideas.Count(); }
>>>>>>>
get { return db.Ideas.Count(); }
} |
<<<<<<<
=======
using System;
using System.ComponentModel.DataAnnotations;
>>>>>>>
<<<<<<<
public int UserId { get; set; }
public string Author { get; set; }
=======
>>>>>>> |
<<<<<<<
var webpackTsConfig = new TsConfigWebpack();
await Write(webpackTsConfig, "tsconfig.esm.json");
=======
var webpackTsConfig = new TsConfigWebpack { Model = codeModel };
await Write(webpackTsConfig, Path.Combine("../", "tsconfig.es... |
<<<<<<<
var enumName = enumType.Name.ToPascalCase();
if (inModelsModule || enumName.Contains('.'))
tsType = enumName;
else
tsType = "Models." + enumName;
=======
var enumName = enumType.Name;
tsTyp... |
<<<<<<<
/// <summary>
/// Whether or not to generate a new package.json file.
/// </summary>
public bool GeneratePackageJson { get; set; } = true;
/// <summary>
/// Whether or not to generate a new readme.md file.
/// </summary>
public bool GenerateReadme... |
<<<<<<<
using UltimaXNA.Configuration;
using UltimaXNA.Configuration.Properties;
=======
>>>>>>>
using UltimaXNA.Configuration;
using UltimaXNA.Configuration.Properties;
<<<<<<<
player.Move_Instant(packet.X, packet.Y, packet.Z, packet.Direction);
PartySettings.LeavePa... |
<<<<<<<
using UltimaXNA.Ultima.IO;
=======
using UltimaXNA.Ultima.IO;
using UltimaXNA.Ultima.Data;
>>>>>>>
using UltimaXNA.Ultima.Data;
using UltimaXNA.Ultima.IO; |
<<<<<<<
Settings.World.FullScreenResolution = new Resolution(m_FullScreenResolutionsList[m_DropDownFullScreenResolutions.Index].Width, m_FullScreenResolutionsList[m_DropDownFullScreenResolutions.Index].Height);
Settings.World.PlayWindowGumpResolution = new Resolution(m_PlayWindowResolutionsList[... |
<<<<<<<
=======
// up button
spriteBatch.Draw2D(m_btnUpClicked ? m_gumpUpButton[1] : m_gumpUpButton[0], new Vector3(X, Y, 0), Vector3.Zero);
>>>>>>>
<<<<<<<
=======
spriteBatch.Draw2D(m_gumpBackground[0], new Vector3(X, Y + m_gumpUpButton[0].Height, 0), Vector3.Zero);
>>>>>>>
... |
<<<<<<<
public DataCollector GetById(Guid id)
=======
public Task<IEnumerable<DataCollector>> GetAllAsync()
{
return GetManyAsync(_ => true);
}
public DataCollector GetById(DataCollectorId id)
>>>>>>>
public DataCollector GetById(DataCollectorId id)
<<<<<... |
<<<<<<<
public Project GetById(Guid projectId)
=======
public async Task<IEnumerable<Project>> GetAllAsync()
{
return (await _collection.FindAsync(_ => true)).ToList();
}
public Project GetById(ProjectId projectId)
>>>>>>>
public Project GetById(ProjectId ... |
<<<<<<<
logger.WriteLine("Adding analyzer '{0}'", fullPath);
_context.AddAdditionalFile(fullPath);
=======
_context.AddAnalyzerReference(fullPath);
>>>>>>>
logger.WriteLine("Adding analyzer '{0}'", fullPath);
_context.AddAnalyzerReferenc... |
<<<<<<<
public HealthRisk GetById(Guid id)
=======
public async Task<IEnumerable<HealthRisk>> GetAllAsync()
{
return await GetManyAsync(_ => true);
}
public HealthRisk GetById(HealthRiskId id)
>>>>>>>
public HealthRisk GetById(HealthRiskId id)
<<<<<<<
... |
<<<<<<<
public void SaveInvalidReport(Guid caseReportId, Guid dataCollectorId, string message, string origin,
=======
public Task<IEnumerable<InvalidCaseReport>> GetAllAsync()
{
return GetManyAsync(_ => true);
}
public void SaveInvalidReport(CaseReportId caseRepor... |
<<<<<<<
public void InsertNumCases(RegionWithHealthRisk region, int day, NumberOfPeople numCases)
{
if (day < 7)
{
region.Days0to6 += numCases;
} else if (day < 14)
{
region.Days7to13 += numCases;
} else if (day ... |
<<<<<<<
=======
using Read.DataCollectors;
using Read.GreetingGenerators;
>>>>>>>
using Read.DataCollectors;
using Read.GreetingGenerators;
<<<<<<<
ISystemConfiguratorRepository systemConfiguratorRepository,
IDataCollectors dataCollectors,
IGreetingHistories greeting... |
<<<<<<<
public int UpdateFrom2() {
SchemaBuilder.AlterTable("ListViewPartRecord",
table => table
.AddColumn<bool>("IsDefault", column => column.WithDefault(false)));
SchemaBuilder.ExecuteSql(@" UPDATE Coevery_Projections_ListViewPartRecord
... |
<<<<<<<
var index = Options.KnownTypesDict[type];
var wrapper = new KnownTypeObjectSerializer((ObjectSerializer) serializer, index);
=======
var wrapper = new KnownTypeObjectSerializer((ObjectSerializer)serializer, index);
>>>>>>>
var wrapper = new Know... |
<<<<<<<
var trackDeserializedObjectMethod = typeof(DeserializerSession).GetTypeInfo().GetMethod(nameof(DeserializerSession.TrackDeserializedObject));
=======
var trackDeserializedObjectMethod =
typeof(DeserializerSession).GetMethod(nameof(DeserializerSession.TrackDe... |
<<<<<<<
/// Looks up a localized string similar to Commit....
/// </summary>
public static string CodeExplorer_Commit {
get {
return ResourceManager.GetString("CodeExplorer_Commit", resourceCulture);
}
}
/// <summary>
///... |
<<<<<<<
=======
using Rubberduck.Interaction;
using Rubberduck.Parsing.Rewriter;
>>>>>>>
using Rubberduck.Parsing.Rewriter;
<<<<<<<
_factory = factory;
=======
_rewritingManager = rewritingManager;
>>>>>>>
_factory = factory;
_rewritingManager = rewritingManager;
... |
<<<<<<<
using Rubberduck.UI;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events;
=======
>>>>>>>
using Rubberduck.UI;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events; |
<<<<<<<
.Select(issue => new InspectionResult(this,
string.Format(InspectionsUI.SelfAssignedDeclarationInspectionResultFormat, issue.IdentifierName),
issue));
=======
.Where(resu... |
<<<<<<<
private readonly IRefactoringPresenterFactory _factory;
=======
private readonly IRewritingManager _rewritingManager;
private readonly IRefactoringDialog<RenameViewModel> _view;
>>>>>>>
private readonly IRefactoringPresenterFactory _factory;
<<<<<<<
_factory = fac... |
<<<<<<<
private readonly IVBE _vbe;
=======
private readonly IRewritingManager _rewritingManager;
>>>>>>>
private readonly IVBE _vbe;
private readonly IRewritingManager _rewritingManager;
<<<<<<<
_vbe = vbe;
=======
_rewritingManager = rewritingManager;
>>>... |
<<<<<<<
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Management.Automation;
using System.Net;
=======
>>>>>>>
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Management.Automation;
using System.Net;
... |
<<<<<<<
var refactoring = new ReorderParametersRefactoring(state, vbe.Object, factory.Object, null, state.ProjectsProvider);
=======
var refactoring = new ReorderParametersRefactoring(vbe.Object, factory.Object, null, rewritingManager);
>>>>>>>
var refactoring = new Re... |
<<<<<<<
using Rubberduck.Parsing.Rewriter;
using Rubberduck.Parsing.Symbols.ParsingExceptions;
using Rubberduck.Parsing.VBA.ComReferenceLoading;
using Rubberduck.Parsing.VBA.DeclarationResolving;
using Rubberduck.Parsing.VBA.Extensions;
using Rubberduck.Parsing.VBA.Parsing;
using Rubberduck.Parsing.VBA.ReferenceManagem... |
<<<<<<<
public enum SourceControlTab
{
Changes,
Branches,
UnsyncedCommits,
Settings
}
public class SourceControlViewViewModel : ViewModelBase
=======
public sealed class SourceControlViewViewModel : ViewModelBase, IDisposable
>>>>>>>
public enum SourceControlT... |
<<<<<<<
[TestCategory("Inspections")]
public void UnassignedVariable_QuickFixWorks()
=======
public void UnassignedVariable_VariableOnSingleLine_QuickFixWorks()
>>>>>>>
[TestCategory("Inspections")]
public void UnassignedVariable_QuickFixWorks()
<<<<<<<
[TestCategory(... |
<<<<<<<
/// Looks up a localized string similar to Unreachable Case Else: All possible values are handled by prior Case statement(s).
/// </summary>
public static string UnreachableCaseInspection_CaseElse {
get {
return ResourceManager.GetString("UnreachableCaseInsp... |
<<<<<<<
using Rubberduck.VBEditor.SourceCodeHandling;
=======
>>>>>>>
using Rubberduck.VBEditor.SourceCodeHandling;
<<<<<<<
var ideMock = vbeBuilder.Build();
var sourceFileHandler = new Mock<ISourceFileHandler>().Object;
ideMock.Setup(m => m.SourceFileHandler).Returns(() => sourc... |
<<<<<<<
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.Parsing.VBA;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events;
=======
using Rubberduck.Inspections.Resources;
>>>>>>>
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.Parsing.VBA;
using Rubberduck.VBEdito... |
<<<<<<<
_refreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRefreshCommand, CanExecuteRefreshCommand);
_repeatLastRunCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRepeatLastRunCommand, CanExecuteRepeatLastRunCommand);
_runNotExe... |
<<<<<<<
using Rubberduck.Parsing.Inspections.Abstract;
using Rubberduck.Parsing.Inspections.Resources;
using Rubberduck.VBEditor.Application;
using Rubberduck.VBEditor.Events;
=======
using Rubberduck.Inspections.Resources;
>>>>>>>
using Rubberduck.Parsing.Inspections.Abstract;
using Rubberduck.Parsing.Inspections.R... |
<<<<<<<
var refactoring = new RenameRefactoring(_vbe, _factory, _messageBox, _state);
refactoring.Refactor(result.Target);
=======
using (var view = new RenameDialog(new RenameViewModel(_state)))
{
var factory = new RenamePresenterFactory(_vbe, view, _st... |
<<<<<<<
private const string Always = "Always";
=======
private const string Never = "Never";
private const string OriginalPath = "OriginalPath";
>>>>>>>
private const string Always = "Always";
private const string OriginalPath = "OriginalPath";
<<<<<<<
private reado... |
<<<<<<<
var declaratioFinder = new DeclarationFinder(
new List<Declaration>(),
new List<IAnnotation>(),
new List<UnboundMemberDeclaration>(),
new Dictionary<QualifiedModuleName, IReadOnlyCollection<IdentifierReference>>(),
new... |
<<<<<<<
[AppliesTo(ProjectCapability.DotNet)]
internal class SingleFileGeneratorFactoryAggregator : IVsSingleFileGeneratorFactory
=======
[AppliesTo(ProjectCapability.CSharpOrVisualBasicOrFSharp)]
internal class SingleFileGeneratorFactoryAggregator : IVsSingleFileGeneratorFactory, IDisposable
>>>>>>>... |
<<<<<<<
new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, userInteraction, null, new Mock<IExtractInterfaceConflictFinderFactory>().Object, new CodeBuilder()),
=======
new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, userInteraction, null, C... |
<<<<<<<
using Rubberduck.VBEditor.Events;
using Rubberduck.UI.CodeExplorer;
=======
using Rubberduck.VBEditor;
using Rubberduck.VBEditor.ComManagement;
>>>>>>>
using Rubberduck.VBEditor.Events;
using Rubberduck.UI.CodeExplorer;
using Rubberduck.VBEditor;
using Rubberduck.VBEditor.ComManagement;
<<<<<<<
... |
<<<<<<<
=======
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
>>>>>>>
<<<<<<<
var item = new Declaration(qualifiedName, hostApp, hostApp, Tokens.Variant, string.Empty, false, false,
Accessibility.Global, DeclarationType.BracketedExpression, context, context.GetSelection(), true, nu... |
<<<<<<<
using Rubberduck.UI;
using Rubberduck.VBERuntime;
=======
using System;
using System.Collections.ObjectModel;
>>>>>>>
using Rubberduck.UI;
using Rubberduck.VBERuntime;
using System;
<<<<<<<
var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, GetMessageBoxM... |
<<<<<<<
using Rubberduck.UI.Refactorings;
using Rubberduck.UI.Refactorings.Rename;
using Rubberduck.UI.Settings;
=======
>>>>>>>
using Rubberduck.UI.Settings;
<<<<<<<
using Rubberduck.VBEditor.ComManagement.TypeLibs;
=======
using Rubberduck.Parsing.Common;
using Rubberduck.Refactorings;
using Rubberduck.VBEditor... |
<<<<<<<
var conflictFinderFactory = new TestConflictFinderFactory() as IExtractInterfaceConflictFinderFactory;
return new ExtractInterfaceRefactoring(baseRefactoring, state, userInteraction, selectionService, conflictFinderFactory, CreateCodeBuilder());
=======
return new ExtractIn... |
<<<<<<<
=======
using Rubberduck.Resources;
>>>>>>>
using Rubberduck.Resources;
<<<<<<<
return _codeBuilder.BuildMemberBlockFromPrototype(mbed, accessibility: Tokens.Private, newIdentifier: $"{interfaceName}_{member.IdentifierName}", content: memberBody);
=======
return _codeBui... |
<<<<<<<
var vm = new CodeExplorerViewModel(new FolderHelper(state), state, removeCommand, _generalSettingsProvider.Object, _windowSettingsProvider.Object, uiDispatcher.Object, vbe.Object);
vm.ExportAllCommand = new ExportAllCommand(vbe.Object, mockFolderBrowserFactory.Object);
=======
... |
<<<<<<<
=======
using Rubberduck.AutoComplete;
using Rubberduck.CodeAnalysis.CodeMetrics;
>>>>>>>
using Rubberduck.AutoComplete;
using Rubberduck.CodeAnalysis.CodeMetrics;
<<<<<<<
using Rubberduck.Parsing.VBA.DeclarationCaching;
using Rubberduck.Parsing.VBA.Parsing.ParsingExceptions;
using Rubberduck.UI.AddRemoveRe... |
<<<<<<<
return Listener.Contexts.Where(context => !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
.Select(context => new ObsoleteCommentSyntaxInspectionResult(this, new QualifiedContext<ParserRuleContext>(context.ModuleName, context.Context)));
=======
... |
<<<<<<<
public RenameDeclarationQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRewritingManager rewritingManager)
: base(typeof(HungarianNotationInspection), typeof(UseMeaningfulNameInspection), typeof(DefaultProjectNameInspection))
=======
public RenameDeclaratio... |
<<<<<<<
var interfaceMember = Declarations.FindInterfaceMember(interfaceImplementation);
var message = string.Format(RubberduckUI.Refactoring_TargetIsInterfaceMemberImplementation, declaration.IdentifierName, interfaceMember.ComponentName, interfaceMember.IdentifierName);
var args = ... |
<<<<<<<
using Rubberduck.VBEditor.Application;
=======
using Rubberduck.UI;
>>>>>>>
using Rubberduck.VBEditor.Application;
using Rubberduck.UI;
<<<<<<<
parser.Parse(new CancellationTokenSource());
if (parser.State.Status >= ParserState.Error) { Assert.Inconclusive("Parser Error"); }
... |
<<<<<<<
public RubberduckMenu(VBE vbe, AddIn addIn, Configuration config, IRubberduckParser parser, IEnumerable<IInspection> inspections)
=======
public RubberduckMenu(VBE vbe, AddIn addIn, IConfigurationService configService, Parser parser, IEnumerable<IInspection> inspections)
>>>>>>>
publi... |
<<<<<<<
[Test]
[Category("Inspections")]
public void InspectionName()
{
const string inspectionName = "ObjectVariableNotSetInspection";
var inspection = new ObjectVariableNotSetInspection(null);
Assert.AreEqual(inspectionName, inspection.Name);
... |
<<<<<<<
private readonly ICodePaneWrapperFactory _wrapperFactory;
=======
private readonly INavigateImplementations _navigateImplementations;
private readonly IRubberduckCodePaneFactory _factory;
>>>>>>>
private readonly ICodePaneWrapperFactory _wrapperFactory;
private readonl... |
<<<<<<<
var refactoring = new RemoveParametersRefactoring(state, vbe.Object, factory.Object);
=======
var refactoring = new RemoveParametersRefactoring(vbe.Object, factory.Object, rewritingManager);
>>>>>>>
var refactoring = new RemoveParametersRefactoring(state, vbe.O... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.