conflict_resolution
stringlengths
27
16k
<<<<<<< void IDisposable.Dispose() { Close(); } public void CreateStream(string stream, Guid id, bool isJson, byte[] metadata) ======= public void CreateStream(string stream, bool isJson, byte[] metadata) >>>>>>> public void CreateStream(string stream, Gui...
<<<<<<< CheckpointStrategy checkpointStrategy, long? checkpointUnhandledBytesThreshold, bool stopOnEof) ======= IHandle<ProjectionSubscriptionMessage.CommittedEventReceived> eventHandler, IHandle<ProjectionSubscriptionMessage.CheckpointSuggested> checkpointHandler, IHan...
<<<<<<< //TODO: revise it var sourceDefintionRecorder = new SourceDefintionRecorder(); stateHandler.ConfigureSourceProcessingStrategy(sourceDefintionRecorder); var sourceDefintion = sourceDefintionRecorder.Build(); var projection = CoreProj...
<<<<<<< private Action _onStopped; private Dictionary<string, List<IEnvelope>> _stateRequests; private List<IEnvelope> _debugStateRequests; ======= private Action _stopCompleted; >>>>>>> private Action _onStopped; private List<IEnvelope> _debugStateRequests; <<<<<<< ...
<<<<<<< IHandle<EventReaderSubscriptionMessage.PartitionDeleted>, ======= IHandle<EventReaderSubscriptionMessage.PartitionMeasured>, >>>>>>> IHandle<EventReaderSubscriptionMessage.PartitionDeleted>, IHandle<EventReaderSubscriptionMessage.PartitionMeasured>,
<<<<<<< [TestMethod] public void OutputAppendTargetFrameworkToOutputPathTrue() { var writer = new ProjectWriter(); var xmlNode = writer.CreateXml(new Project { AppendTargetFrameworkToOutputPath = true, FilePath = new System.IO.FileInfo("test.cs") }); var appendTargetFrameworkToOutputPath ...
<<<<<<< yield return ProcessFile(projectFile, conversionOptions, preTransforms, postTransforms, progress); ======= yield return ProcessFile(projectFile, null, preTransforms, postTransforms, progress); >>>>>>> yield return ProcessFile(projectFile, null, conversionOptions, preTransforms, postTransforms,...
<<<<<<< /// <remarks>Create a set with a single element, el.</remarks> [return: NotNull] ======= [NotNull] >>>>>>> [return: NotNull] <<<<<<< return intervals == null || intervals.Count == 0; ======= /* for (ListIterator iter = interva...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< public ParserInterpreter(string grammarFileName, IVocabulary vocabulary, IEnumera...
<<<<<<< HashSet<PredictionContext> visited = new HashSet<PredictionContext>(); Stack<PredictionContext> workList = new Stack<PredictionContext>(); workList.Push(Context); visited.Add(Context); while (workList.Count > 0) ======= IDictionary<Predic...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] IIntSet AddAll(IIntSet set); ======= [NotNull...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: Nullable] protected internal virtual DFAState GetExistingTargetS...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< public NoViableAltException(IRecognizer recognizer, ITokenStream input, IToken st...
<<<<<<< throw new NotSupportedException(string.Format("EdgeMap of type {0} is supported yet." , m.GetType().FullName)); ======= throw new NotSupportedException(string.Format("EdgeMap of type %s is supported yet.", m.GetType().FullName)); >>>...
<<<<<<< /// <summary>Who threw the exception?</summary> private IRecognizer recognizer; ======= /// <summary> /// The /// <see cref="Recognizer{Symbol, ATNInterpreter}">Recognizer&lt;Symbol, ATNInterpreter&gt; /// </see> /// where this exception originated. ...
<<<<<<< programs[DefaultProgramName] = new List<TokenStreamRewriter.RewriteOperation>(ProgramInitSize ); ======= programs.Put(DefaultProgramName, new List<TokenStreamRewriter.RewriteOperation>(ProgramInitSize)); >>>>>>> programs[DefaultProgramName] = new List<Token...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< List<ATNConfig> sortedConfigs = new List<ATNConfig>(configs); sortedC...
<<<<<<< string message = string.Format(CultureInfo.CurrentCulture, "The specified lexer action type {0} is not valid.", action.GetActionType()); ======= string message = string.Format(CultureInfo.CurrentCulture, "The specified lexer action type %s is not valid."...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] public virtual IList<IParseTree> GetAll(string label) ...
<<<<<<< /// <remarks> /// Get the set of all alternatives represented by configurations in this /// set. /// </remarks> [NotNull] ======= >>>>>>> [NotNull] <<<<<<< ATNConfig mergedConfig; if (mergedConfigs.TryGetValue(configKey, out mergedConfi...
<<<<<<< ======= /* * [The "BSD license"] * Copyright (c) 2012 Terence Parr * Copyright (c) 2012 Sam Harwell * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of sou...
<<<<<<< * [The "BSD license"] * Copyright (c) 2013 Terence Parr * Copyright (c) 2013 Sam Harwell * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source...
<<<<<<< [return: NotNull] public virtual MultiMap<string, IParseTree> GetLabels() ======= public virtual MultiMap<string, IParseTree> Labels >>>>>>> [NotNull] public virtual MultiMap<string, IParseTree> Labels <<<<<<< [return: Nullable] public virtual IParseTr...
<<<<<<< public override string[] ToStrings(IRecognizer recognizer, int currentState ) ======= public override string[] ToStrings<_T0>(Recognizer<_T0> recognizer, int currentState) >>>>>>> public override string[] ToStrings(IRecognizer recognizer, int currentState) <<<<<<< ...
<<<<<<< PredictionContextCache.IdentityCommutativePredictionContextOperands operands = new PredictionContextCache.IdentityCommutativePredictionContextOperands(selfWorkList .Pop(), otherWorkList.Pop()); if (!visited.Add(operands)) ======= ...
<<<<<<< public virtual int PredictATN(DFA dfa, ITokenStream input, ParserRuleContext outerContext , bool useContext) { if (outerContext == null) { outerContext = ParserRuleContext.EmptyContext; } int alt = 0; int m =...
<<<<<<< /// <see cref="ATNConfig.Context"/> ======= /// <see cref="ATNConfig#context"/> >>>>>>> /// <see cref="ATNConfig.Context"/> <<<<<<< ATNConfig config = c.Transform(c.State, SemanticContext.None, false); dup.AddItem(config); ...
<<<<<<< public abstract bool Eval<Symbol, ATNInterpreter>(Recognizer<Symbol, ATNInterpreter> parser, RuleContext outerContext) where ATNInterpreter : ATNSimulator; ======= public abstract bool Eval<_T0>(Recognizer<_T0> parser, RuleContext parserCallStack); >>>>>>> public abstract...
<<<<<<< [return: NotNull] public virtual IDictionary<string, int> GetTokenTypeMap() ======= public virtual IDictionary<string, int> TokenTypeMap >>>>>>> [NotNull] public virtual IDictionary<string, int> TokenTypeMap <<<<<<< result = Utils.ToMap(tokenNames)...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< public static void RemoveAll<T>(IList<T> list, Predicate<T> predicate) ======= ...
<<<<<<< [return: NotNull] public virtual Lexer GetLexer() ======= public virtual Lexer Lexer >>>>>>> [NotNull] public virtual Lexer Lexer <<<<<<< [return: NotNull] public virtual Parser GetParser() ======= public virtual Parser Parser >>>>>>> ...
<<<<<<< protected internal ConcurrentDictionary<IParseTree, V> annotations = new ConcurrentDictionary<IParseTree , V>(); ======= protected internal IDictionary<IParseTree, V> annotations = new IdentityHashMap<IParseTree, V>(); >>>>>>> protected internal ConcurrentDictionary<IParse...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] public static Antlr4.Runtime.Atn.LexerActionExecutor Ap...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] public virtual string GetErrorHeader(RecognitionExcepti...
<<<<<<< public UnbufferedCharStream(TextReader input) : this(input, 256) ======= public UnbufferedCharStream(StreamReader input) : this(input, 256) >>>>>>> public UnbufferedCharStream(TextReader input) : this(input, 256) <<<<<<< public UnbufferedCharStream(Tex...
<<<<<<< return string.Format(CultureInfo.CurrentCulture, "failed predicate: {{{0}}}?", predicate ); ======= return string.Format(CultureInfo.CurrentCulture, "failed predicate: {%s}?", predicate); >>>>>>> return string.Format(CultureInfo.CurrentCulture, "failed pred...
<<<<<<< using System.Threading.Tasks; ======= using Microsoft.AspNetCore.Builder; >>>>>>> using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; <<<<<<< using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Internal; using Microsoft.AspNetCore.Routing...
<<<<<<< if (!joinedCheckContext.Equals(joinedCheckContext2)) { return null; } } else { PredictionContext check = contextCache.Join(joinedCheckContext, joinedCheckContex...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] string GetText(Interval interval); ======= [N...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] public static IList<ITree> GetAncestors(ITree t) =====...
<<<<<<< /// <see cref="PredictionMode"/> /// <code>(</code> /// <see cref="Atn.PredictionMode.Sll"/> /// <code>)</code> ======= /// <see cref="PredictionMode(PredictionMode)">setPredictionMode</see> /// <c>(</c> /// <see cref="PredictionMode.Sll"/> /// <c>)</c> >>>>>>> /// <see cr...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] public static Antlr4.Runtime.Misc.IntervalSet Subtract(...
<<<<<<< ATNConfig config = c.Transform(c.GetState(), SemanticContext.None); dup.AddItem(config); ======= c = c.Transform(c.State, SemanticContext.None); dup.AddItem(c); >>>>>>> ATNConfig config = c...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< // combine objects // convert to strings...we...
<<<<<<< [return: NotNull] protected internal virtual Tuple<DFAState, ParserRuleContext> ComputeTargetState( DFA dfa, DFAState s, ParserRuleContext remainingGlobalContext, int t, bool useContext , PredictionContextCache contextCache) ======= [NotNull] protected i...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] string GetText(Interval interval); ======= [N...
<<<<<<< #if !PORTABLE ======= matchedEOF = false; >>>>>>> matchedEOF = false; #if !PORTABLE <<<<<<< /// Given an AmbiguityInfo object that contains information about an /// ambiguous decision event, return the list of ambiguous parse trees. /// </summary> /// ...
<<<<<<< public DFASerializer(DFA dfa, IRecognizer parser) : this(dfa, parser != null ? parser.TokenNames : null, parser != null ? parser.RuleNames : null, parser != null ? parser.Atn : null) ======= public DFASerializer(DFA dfa, Recognizer<object, object> parser) : this(dfa, pa...
<<<<<<< [return: NotNull] public virtual ParseTreePatternMatcher GetMatcher() ======= public virtual ParseTreePatternMatcher Matcher >>>>>>> [NotNull] public virtual ParseTreePatternMatcher Matcher <<<<<<< [return: NotNull] public virtual string GetPattern() ...
<<<<<<< PredictionContextCache.PredictionContextAndInt operands = new PredictionContextCache.PredictionContextAndInt (context, invokingState); PredictionContext result; if (!childContexts.TryGetValue(operands, out result)) ======= PredictionContextCache....
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] private static string FormatMessage(string predicate, s...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< result[literalName] = i; } string symboli...
<<<<<<< ======= /* Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: NotNull] IEdgeMap<T> Put(int key, T value); ======= [NotN...
<<<<<<< int ruleIndex = p.GetRuleIndex(); string ruleName = ruleIndex >= 0 && ruleIndex < ruleNames.Count ? ruleNames[ruleIndex] : ruleIndex.ToString(); ======= int ruleIndex = p.RuleIndex; string ruleName = ruleIndex >= 0 && ruleIndex < ...
<<<<<<< public DefaultProjectSnapshotWorker( ForegroundDispatcher foregroundDispatcher, ProjectExtensibilityConfigurationFactory configurationFactory, TagHelperResolver tagHelperResolver) ======= public DefaultProjectSnapshotWorker(ForegroundDispatcher foregroundDis...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: Nullable] protected internal virtual IToken SingleTokenDeletion(...
<<<<<<< public readonly IDictionary<string, TokensStartState> modeNameToStartState = new Dictionary<string, TokensStartState>(); ======= public readonly IDictionary<string, TokensStartState> modeNameToStartState = new LinkedHashMap<string, TokensStartState>(); >>>>>>> public read...
<<<<<<< using Antlr4.Runtime.Sharpen; ======= >>>>>>> <<<<<<< /// <see cref="ParseTreeMatch.MismatchedNode"/> ======= /// <see cref="ParseTreeMatch#mismatchedNode"/> >>>>>>> /// <see cref="ParseTreeMatch.MismatchedNode"/>
<<<<<<< public static readonly int SerializedVersion = 5; ======= public static readonly int SerializedVersion; static ATNSimulator() { SerializedVersion = 3; } public static readonly UUID SerializedUuid; static ATNSimulator() { ...
<<<<<<< ======= /* * Copyright (c) 2012 The ANTLR Project. All rights reserved. * Use of this file is governed by the BSD-3-Clause license that * can be found in the LICENSE.txt file in the project root. */ >>>>>>> <<<<<<< [return: Nullable] protected internal virtual DFAState GetExistingTargetS...
<<<<<<< ======= static ATNSimulator() { Error = new DFAState(new EmptyEdgeMap<DFAState>(0, -1), new EmptyEdgeMap<DFAState>(0, -1), new ATNConfigSet()); Error.stateNumber = int.MaxValue; } >>>>>>>
<<<<<<< public ParserInterpreter(string grammarFileName, IEnumerable<string> tokenNames, IEnumerable<string> ruleNames, ATN atn, ITokenStream input) ======= [System.ObsoleteAttribute(@"Use ParserInterpreter(string, IVocabulary, System.Collections.Generic.ICollection{E}, Antlr4.Runtime.Atn.ATN, ITokenS...
<<<<<<< [return: NotNull] public virtual BitArray GetRepresentedAlternatives() ======= [NotNull] public virtual BitSet GetRepresentedAlternatives() >>>>>>> [return: NotNull] public virtual BitSet GetRepresentedAlternatives()
<<<<<<< ATNConfigSet closure = s.configs; DFAState target = null; target = s.GetTarget(t); if (target == Error) { break; } #if !PORTABLE if (debug && target != null) ======= ...
<<<<<<< using Antlr4.Runtime.Sharpen; ======= >>>>>>> <<<<<<< /// <seealso cref="Antlr4.Runtime.Atn.ATNDeserializationOptions.GenerateRuleBypassTransitions()">Antlr4.Runtime.Atn.ATNDeserializationOptions.GenerateRuleBypassTransitions()</seealso> private static readonly IDictionary<string, ATN> bypas...
<<<<<<< #if false private static readonly Logger Logger = Logger.GetLogger(typeof(Antlr4.Runtime.Misc.RuleDependencyChecker ).FullName); #endif ======= private static readonly Logger Logger = Logger.GetLogger(typeof(Antlr4.Runtime.Misc.RuleDependencyChecker).FullName); >>>>>>> #if false ...
<<<<<<< [return: NotNull] public string GetTag() ======= public string Tag >>>>>>> [NotNull] public string Tag <<<<<<< [return: Nullable] public string GetLabel() ======= public string Label >>>>>>> [Nullable] public string Label
<<<<<<< ======= IIntentDonationService intentDonationService, IDialogService dialogService, ISchedulerProvider schedulerProvider, >>>>>>> IIntentDonationService intentDonationService, <<<<<<< Ensure.Argument.IsNotNull(accessRestrictionStorage, nameof(acces...
<<<<<<< private static TimeEntry createTimeEntry(IUser user) => new TimeEntry { WorkspaceId = user.DefaultWorkspaceId.Value, Billable = false, Start = new DateTimeOffset(DateTime.Now - TimeSpan.FromMinutes(5)), Duration = (long)TimeSpan.FromMinutes(5).Tota...
<<<<<<< private const double desiredIpadHeight = 360; private static readonly nfloat nameAlreadyTakenHeight = 16; ======= private static readonly nfloat errorVisibleHeight = 16; >>>>>>> private const double desiredIpadHeight = 360; private static readonly nfloat errorVisibleHe...
<<<<<<< AvailableOptions = options.Select(toSelectableOption).ToList(); SelectOption = rxActionFactory.FromAction<SelectableCalendarNotificationsOptionViewModel>(onSelectOption); Close = rxActionFactory.FromAction(() => navigationService.Close(this, Unit.Default)); ======= ...
<<<<<<< var chosenProject = await Navigate<SelectProjectViewModel, SelectProjectParameter, SelectProjectParameter>( SelectProjectParameter.WithIds(projectId, taskId, workspaceId)); ======= var chosenProject = await navigationService .Navigate<SelectProjectVi...
<<<<<<< .GroupBy(te => te.Start.LocalDateTime.Date) .Select(grouping => new TimeEntryViewModelCollection(grouping.Key, grouping, durationFormat)); ======= .GroupBy(te => te.StartTime.LocalDateTime.Date) .Select(grouping => new TimeEntryViewModelCollectio...
<<<<<<< checkCalendarPermissions(); navigationFromMainViewModelStopwatch = stopwatchProvider.Get(MeasuredOperation.OpenSettingsView); stopwatchProvider.Remove(MeasuredOperation.OpenStartView); ======= await checkCalendarPermissions(); >>>>>>> checkCalendarP...
<<<<<<< IIntentDonationService intentDonationService, IRxActionFactory rxActionFactory, INavigationService navigationService) : base(navigationService) ======= IRxActionFactory rxActionFactory) >>>>>>> IRxActionFactory rxActionFactory, ...
<<<<<<< private readonly ISchedulerProvider schedulerProvider; ======= private readonly IPermissionsService permissionsService; >>>>>>> private readonly ISchedulerProvider schedulerProvider; private readonly IPermissionsService permissionsService; <<<<<<< this.schedulerPr...
<<<<<<< using Toggl.Core.Tests.TestExtensions; ======= using Toggl.Shared; >>>>>>> using Toggl.Core.Tests.TestExtensions; using Toggl.Shared;
<<<<<<< public static string ContinueTimerInvocationPhrase { get { return ResourceManager.GetString("ContinueTimerInvocationPhrase", resourceCulture); } } ======= public static string NumberOfTasksPlural { get { ...
<<<<<<< using CoreGraphics; using MvvmCross.Binding.BindingContext; using MvvmCross.Platforms.Ios.Binding; using MvvmCross.Platforms.Ios.Views; using MvvmCross.Plugin.Color; ======= using Foundation; using MvvmCross.Plugin.Color.Platforms.Ios; using Toggl.Daneel.Extensions; using Toggl.Daneel.Extensions.Reactive; >>...
<<<<<<< private string googleToken; ======= private List<bool> onboardingPagesViewed = new List<bool> { false, false, false }; >>>>>>> private string googleToken; private List<bool> onboardingPagesViewed = new List<bool> { false, false, false }; <<<<<<< analyticsServic...
<<<<<<< UIViewController createTabFor(IMvxViewModel viewModel) { var controller = new UINavigationController(); var screen = this.CreateViewControllerFor(viewModel) as UIViewController; var item = new UITabBarItem(); item.Title = ""...
<<<<<<< ======= var currentDate = timeService.CurrentDateTime.Date; startDate = currentDate.AddDays(1 - (int)currentDate.DayOfWeek); endDate = startDate.AddDays(6); source = ReportsSource.Initial; >>>>>>> source = ReportsSource.Initial;
<<<<<<< => new GetByIdInteractor<IThreadSafeTag, IDatabaseTag>(dataSource.Tags, id); public IInteractor<IObservable<IEnumerable<IThreadSafeTag>>> GetMultipleTagsById(params long[] ids) => new GetMultipleByIdInteractor<IThreadSafeTag, IDatabaseTag>(dataSource.Tags, ids); ======= ...
<<<<<<< using Toggl.Foundation.Calendar; ======= using Toggl.Foundation.DTOs; >>>>>>> using Toggl.Foundation.Calendar; using Toggl.Foundation.DTOs; <<<<<<< #region Calendar IInteractor<IObservable<CalendarItem>> GetCalendarItemWithId(string eventId); IInteractor<IObservable<IEnumerable<Ca...
<<<<<<< private Toolbar toolbar; private TextInputLayout tokenResetPasswordLayout; ======= >>>>>>> private TextInputLayout tokenResetPasswordLayout; <<<<<<< toolbar = FindViewById<Toolbar>(Resource.Id.Toolbar); tokenResetPasswordLayout = FindViewById<TextInputLayout...
<<<<<<< ======= AccessibilityService, UpdateRemoteConfigCacheService, >>>>>>> AccessibilityService, <<<<<<< ======= bool useAccessibilityService, bool useRemoteConfigUpdateService, >>>>>>> bool...
<<<<<<< // We're at the end of a comment. check the condition 2.3 to make sure the text ending is allowed. isValidComment = !EndsWithSymbolsSequence(p, HtmlSymbolType.OpenAngle, HtmlSymbolType.Bang, HtmlSymbolType.DoubleHyphen); return true; =====...
<<<<<<< ======= using Toggl.Core.UI.ViewModels.Reports; using UIKit; using System.Reactive.Disposables; >>>>>>> using Toggl.Core.UI.ViewModels.Reports; using UIKit; using System.Reactive.Disposables; <<<<<<< using Toggl.Foundation.MvvmCross.Extensions; using Toggl.Foundation.MvvmCross.ViewModels.Reports; using Togg...
<<<<<<< using Toggl.Foundation.Analytics; using Toggl.Foundation.DataSources.Interfaces; using Toggl.Foundation.Extensions; ======= >>>>>>> using Toggl.Foundation.Analytics; using Toggl.Foundation.DataSources.Interfaces; using Toggl.Foundation.Extensions; <<<<<<< private readonly IBaseDataSource<T> dataSour...
<<<<<<< ======= private readonly Lazy<ISuggestionProviderContainer> suggestionProviderContainer; private readonly Lazy<IPushNotificationsTokenService> pushNotificationsTokenService; private readonly Lazy<IPushNotificationsTokenStorage> pushNotificationsTokenStorage; >>>>>>> private re...
<<<<<<< public IObservable<bool> IsForAccountLinking { get; } ======= public IObservable<Unit> GoToNextPageObservable { get; } >>>>>>> public IObservable<bool> IsForAccountLinking { get; } public IObservable<Unit> GoToNextPageObservable { get; } <<<<<<< IsForAccountLinki...
<<<<<<< public override void OnBindViewHolder(RecyclerView.ViewHolder holder, int position) { var stopwatchForViewHolder = createStopwatchFor(holder); stopwatchForViewHolder?.Start(); base.OnBindViewHolder(holder, position); stopwatchForViewHolder?.Stop();...
<<<<<<< using AuthenticationServices; using Toggl.Core.Helper; using Toggl.Core.UI.Extensions; using Toggl.Core.UI.Helper; ======= using CoreText; using Foundation; >>>>>>> using AuthenticationServices; using Foundation; <<<<<<< private const int iPhoneSeScreenHeight = 568; private bool keyboardIsO...
<<<<<<< ======= IsInManualMode = userPreferences.IsManualModeEnabled; handleNoWorkspaceState() .ContinueWith(_ => handleNoDefaultWorkspaceState()); } private async Task handleNoWorkspaceState() { >>>>>>> handleNoWorkspaceState() ...
<<<<<<< StartTimeEntry = rxActionFactory.FromAsync<Suggestion>(suggestion => startTimeEntry(suggestion)); ======= await base.Initialize(); StartTimeEntry = rxActionFactory.FromObservable<Suggestion, IThreadSafeTimeEntry>(startTimeEntry); >>>>>>> base.Initialize(); ...
<<<<<<< private readonly IIntentDonationService intentDonationService; ======= private readonly IAccessRestrictionStorage accessRestrictionStorage; >>>>>>> private readonly IIntentDonationService intentDonationService; private readonly IAccessRestrictionStorage accessRestrictionStorag...
<<<<<<< var url = ServerFixture.Url + "/echo"; // The test should connect to the server using WebSockets transport on Windows 8 and newer. // On Windows 7/2008R2 it should use ServerSentEvents transport to connect to the server. var connection = new HttpConnection(new Uri...
<<<<<<< var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(); var connectionHandler = serviceProvider.GetService<HubConnectionHandler<StreamingHub>>(); var invocationBinder = new Mock<IInvocationBinder>(); invocationBinder.Setup(b => b.GetStreamItem...
<<<<<<< => new TimeEntriesViewModel(DataSource, InteractorFactory, AnalyticsService, SchedulerProvider, RxActionFactory, TimeService); ======= => new TimeEntriesViewModel(DataSource, SyncManager, InteractorFactory, AnalyticsService, SchedulerProvider, RxActionFactory); >>>>>>> ...
<<<<<<< await Navigate<SelectWorkspaceViewModel, long, long>(defaultWorkspace.Id); ======= await navigationService .Navigate<SelectWorkspaceViewModel, SelectWorkspaceParameters, long>(new SelectWorkspaceParameters(Resources.SetDefaultWorkspace, defaultWorkspace.Id))...