Skip to content

Commit 48d9ffb

Browse files
committed
Fix whitespace formatting
1 parent 30b547b commit 48d9ffb

File tree

106 files changed

+298
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+298
-345
lines changed

nuke/ReleaseNotesParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private IReadOnlyList<ReleaseNotes> ParseComplexFormat(string[] lines)
8585

8686
// Parse content.
8787
var notes = new List<string>();
88-
88+
8989
while (true)
9090
{
9191
// Sanity checks.

src/ElectronNET.API/API/ApiBase.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// ReSharper disable InconsistentNaming
2+
23
namespace ElectronNET.API
34
{
45
using Common;
@@ -17,6 +18,7 @@ protected enum SocketTaskEventNameTypes
1718
DashesLowerFirst,
1819
NoDashUpperFirst
1920
}
21+
2022
protected enum SocketTaskMessageNameTypes
2123
{
2224
DashesLowerFirst,
@@ -176,6 +178,12 @@ protected void RemoveEvent(Action value, int? id = null, [CallerMemberName] stri
176178
protected void AddEvent<T>(Action<T> value, int? id = null, [CallerMemberName] string callerName = null)
177179
{
178180
Debug.Assert(callerName != null, nameof(callerName) + " != null");
181+
<<<<<<< HEAD
182+
=======
183+
184+
var eventName = EventName(callerName);
185+
var eventKey = EventKey(eventName, id);
186+
>>>>>>> c554673 (Fix whitespace formatting)
179187

180188
var eventName = this.EventName(callerName);
181189
var eventKey = this.EventKey(eventName, id);
@@ -370,4 +378,4 @@ public bool Unregister<T>(Action<T> receiver)
370378
}
371379
}
372380
}
373-
}
381+
}

src/ElectronNET.API/API/App.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public event Action WindowAllClosed
5858
private event Action _windowAllClosed;
5959

6060
/// <summary>
61-
/// Emitted before the application starts closing its windows.
61+
/// Emitted before the application starts closing its windows.
6262
/// <para/>
6363
/// Note: If application quit was initiated by <see cref="AutoUpdater.QuitAndInstall"/> then <see cref="BeforeQuit"/>
6464
/// is emitted after emitting close event on all windows and closing them.
@@ -399,7 +399,6 @@ internal static App Instance
399399
private static object _syncRoot = new object();
400400

401401

402-
403402
/// <summary>
404403
/// Try to close all windows. The <see cref="BeforeQuit"/> event will be emitted first. If all windows are successfully
405404
/// closed, the <see cref="WillQuit"/> event will be emitted and by default the application will terminate. This method
@@ -558,7 +557,7 @@ public void SetPath(PathName name, string path)
558557
}
559558

560559
/// <summary>
561-
/// The version of the loaded application. If no version is found in the application’s package.json file,
560+
/// The version of the loaded application. If no version is found in the application’s package.json file,
562561
/// the version of the current bundle or executable is returned.
563562
/// </summary>
564563
/// <returns>The version of the loaded application.</returns>
@@ -1245,7 +1244,7 @@ public Task<string> UserAgentFallbackAsync
12451244
return Task.Run(() =>
12461245
{
12471246
var taskCompletionSource = new TaskCompletionSource<string>();
1248-
1247+
12491248
BridgeConnector.Socket.Once<string>("appGetUserAgentFallbackCompleted", taskCompletionSource.SetResult);
12501249
BridgeConnector.Socket.Emit("appGetUserAgentFallback");
12511250

@@ -1295,4 +1294,4 @@ public void Once(string eventName, Action action)
12951294
public async Task Once(string eventName, Action<object> action)
12961295
=> await Events.Instance.Once(ModuleName, eventName, action).ConfigureAwait(false);
12971296
}
1298-
}
1297+
}

src/ElectronNET.API/API/AutoUpdater.cs

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace ElectronNET.API
1010
/// <summary>
1111
/// Enable apps to automatically update themselves. Based on electron-updater.
1212
/// </summary>
13-
public sealed class AutoUpdater: ApiBase
13+
public sealed class AutoUpdater : ApiBase
1414
{
1515
protected override SocketTaskEventNameTypes SocketTaskEventNameType => SocketTaskEventNameTypes.DashesLowerFirst;
1616
protected override SocketTaskMessageNameTypes SocketTaskMessageNameType => SocketTaskMessageNameTypes.DashesLowerFirst;
@@ -49,7 +49,7 @@ public bool AutoInstallOnAppQuit
4949
}
5050

5151
/// <summary>
52-
/// *GitHub provider only.* Whether to allow update to pre-release versions.
52+
/// *GitHub provider only.* Whether to allow update to pre-release versions.
5353
/// Defaults to "true" if application version contains prerelease components (e.g. "0.12.1-alpha.1", here "alpha" is a prerelease component), otherwise "false".
5454
///
5555
/// If "true", downgrade will be allowed("allowDowngrade" will be set to "true").
@@ -67,7 +67,7 @@ public bool AllowPrerelease
6767
}
6868

6969
/// <summary>
70-
/// *GitHub provider only.*
70+
/// *GitHub provider only.*
7171
/// Get all release notes (from current version to latest), not just the latest (Default is false).
7272
/// </summary>
7373
public bool FullChangelog
@@ -122,7 +122,7 @@ public Task<SemVer> CurrentVersionAsync
122122
}
123123

124124
/// <summary>
125-
/// Get the update channel. Not applicable for GitHub.
125+
/// Get the update channel. Not applicable for GitHub.
126126
/// Doesn’t return channel from the update configuration, only if was previously set.
127127
/// </summary>
128128
[Obsolete("Use the asynchronous version ChannelAsync instead")]
@@ -135,7 +135,7 @@ public string Channel
135135
}
136136

137137
/// <summary>
138-
/// Get the update channel. Not applicable for GitHub.
138+
/// Get the update channel. Not applicable for GitHub.
139139
/// Doesn’t return channel from the update configuration, only if was previously set.
140140
/// </summary>
141141
public Task<string> ChannelAsync
@@ -147,7 +147,7 @@ public Task<string> ChannelAsync
147147
}
148148

149149
/// <summary>
150-
/// Set the update channel. Not applicable for GitHub.
150+
/// Set the update channel. Not applicable for GitHub.
151151
/// </summary>
152152
public string SetChannel
153153
{
@@ -199,7 +199,7 @@ public event Action OnCheckingForUpdate
199199
}
200200

201201
/// <summary>
202-
/// Emitted when there is an available update.
202+
/// Emitted when there is an available update.
203203
/// The update is downloaded automatically if AutoDownload is true.
204204
/// </summary>
205205
public event Action<UpdateInfo> OnUpdateAvailable
@@ -332,11 +332,11 @@ public Task<UpdateCheckResult> CheckForUpdatesAndNotifyAsync()
332332
}
333333

334334
/// <summary>
335-
/// Restarts the app and installs the update after it has been downloaded.
336-
/// It should only be called after `update-downloaded` has been emitted.
337-
///
338-
/// Note: QuitAndInstall() will close all application windows first and only emit `before-quit` event on `app` after that.
339-
/// This is different from the normal quit event sequence.
335+
/// Restarts the app and installs the update after it has been downloaded.
336+
/// It should only be called after `update-downloaded` has been emitted.
337+
///
338+
/// Note: QuitAndInstall() will close all application windows first and only emit `before-quit` event on `app` after that.
339+
/// This is different from the normal quit event sequence.
340340
/// </summary>
341341
/// <param name="isSilent">*windows-only* Runs the installer in silent mode. Defaults to `false`.</param>
342342
/// <param name="isForceRunAfter">Run the app after finish even on silent install. Not applicable for macOS. Ignored if `isSilent` is set to `false`.</param>
@@ -374,9 +374,5 @@ public Task<string> GetFeedURLAsync()
374374

375375
return tcs.Task;
376376
}
377-
378-
379377
}
380-
}
381-
382-
378+
}

src/ElectronNET.API/API/BrowserView.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ namespace ElectronNET.API
88
/// It is like a child window, except that it is positioned relative to its owning window.
99
/// It is meant to be an alternative to the webview tag.
1010
/// </summary>
11-
public class BrowserView: ApiBase
11+
public class BrowserView : ApiBase
1212
{
1313
protected override SocketTaskEventNameTypes SocketTaskEventNameType => SocketTaskEventNameTypes.DashesLowerFirst;
1414
protected override SocketTaskMessageNameTypes SocketTaskMessageNameType => SocketTaskMessageNameTypes.DashesLowerFirst;
15+
1516
/// <summary>
1617
/// Gets the identifier.
1718
/// </summary>
@@ -69,5 +70,4 @@ public void SetBackgroundColor(string color)
6970
BridgeConnector.Socket.Emit("browserView-setBackgroundColor", Id, color);
7071
}
7172
}
72-
}
73-
73+
}

0 commit comments

Comments
 (0)