Skip to content

Commit

Permalink
imp - brk - Updated namespaces
Browse files Browse the repository at this point in the history
We've updated namespaces

---

We have updated namespaces to their correct places. In order to use ConsoleTools, you must change the imports to Terminaux.Reader.Tools from Terminaux.Tools

---

Type: imp
Breaking: True
Doc Required: False
Part: 1/1
  • Loading branch information
AptiviCEO committed Aug 7, 2023
1 parent 76b840e commit ed32a0d
Show file tree
Hide file tree
Showing 27 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBinding.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
using System;
using System.Collections.Generic;
using System.Text;
using Terminaux.Reader.Tools;
using Terminaux.Sequences.Tools;
using Terminaux.Tools;

namespace Terminaux.Reader.Bindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/BackwardOneWord.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/CutToEnd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/CutToStart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/DebugPos.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

using System;
using System.Threading;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/Delete.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/End.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/ForwardOneWord.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/GoLeft.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/GoRight.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/Home.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/LowercaseOneWord.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/NextHistory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/NextSuggestion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

using System;
using System.Linq;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/PreviousHistory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

using System;
using System.Linq;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/Rubout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/UppercaseOneWord.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/Bindings/BaseBindings/Yank.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

using System;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader.Bindings.BaseBindings
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/TermReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

using System;
using Terminaux.Reader.Bindings;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader
{
Expand Down
2 changes: 1 addition & 1 deletion Terminaux/Reader/TermReaderTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

using System;
using System.Threading;
using Terminaux.Tools;
using Terminaux.Reader.Tools;

namespace Terminaux.Reader
{
Expand Down
38 changes: 19 additions & 19 deletions Terminaux/Reader/Tools/ConsoleWrapperTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
using System;
using Terminaux.Reader;

namespace Terminaux.Tools
namespace Terminaux.Reader.Tools
{
/// <summary>
/// Wrapper for the <see cref="Console"/> class to ensure safety against dumb consoles. Taken from Kernel Simulator 0.1.0.
Expand Down Expand Up @@ -52,7 +52,7 @@ public static class ConsoleTools
/// Is the console a dumb console?
/// </summary>
public static Func<bool> ActionIsDumb
{
{
get => actionIsDumb;
set => actionIsDumb = value ?? (() => IsDumb);
}
Expand All @@ -67,31 +67,31 @@ public static Func<int> ActionCursorLeft
/// <summary>
/// The cursor top position
/// </summary>
public static Func<int> ActionCursorTop
public static Func<int> ActionCursorTop
{
get => actionCursorTop;
set => actionCursorTop = value ?? (() => CursorTop);
}
/// <summary>
/// The console window width (columns)
/// </summary>
public static Func<int> ActionWindowWidth
public static Func<int> ActionWindowWidth
{
get => actionWindowWidth;
set => actionWindowWidth = value ?? (() => WindowWidth);
}
/// <summary>
/// The console window height (rows)
/// </summary>
public static Func<int> ActionWindowHeight
public static Func<int> ActionWindowHeight
{
get => actionWindowHeight;
set => actionWindowHeight = value ?? (() => WindowHeight);
}
/// <summary>
/// The console buffer height (rows)
/// </summary>
public static Func<int> ActionBufferHeight
public static Func<int> ActionBufferHeight
{
get => actionBufferHeight;
set => actionBufferHeight = value ?? (() => WindowHeight);
Expand Down Expand Up @@ -128,7 +128,7 @@ public static Func<bool> ActionKeyAvailable
public static Action<int, int> ActionSetCursorPosition
{
get => actionSetCursorPosition;
set => actionSetCursorPosition = value ?? (SetCursorPosition);
set => actionSetCursorPosition = value ?? SetCursorPosition;
}
/// <summary>
/// Sets the cursor left position<br></br><br></br>
Expand All @@ -137,7 +137,7 @@ public static Action<int, int> ActionSetCursorPosition
public static Action<int> ActionSetCursorLeft
{
get => actionSetCursorLeft;
set => actionSetCursorLeft = value ?? (SetCursorLeft);
set => actionSetCursorLeft = value ?? SetCursorLeft;
}
/// <summary>
/// Sets the cursor top position<br></br><br></br>
Expand All @@ -146,15 +146,15 @@ public static Action<int> ActionSetCursorLeft
public static Action<int> ActionSetCursorTop
{
get => actionSetCursorTop;
set => actionSetCursorTop = value ?? (SetCursorTop);
set => actionSetCursorTop = value ?? SetCursorTop;
}
/// <summary>
/// Beeps the console
/// </summary>
public static Action ActionBeep
{
get => actionBeep;
set => actionBeep = value ?? (Beep);
set => actionBeep = value ?? Beep;
}
/// <summary>
/// Reads a key<br></br><br></br>
Expand All @@ -163,7 +163,7 @@ public static Action ActionBeep
public static Func<bool, ConsoleKeyInfo> ActionReadKey
{
get => actionReadKey;
set => actionReadKey = value ?? (ReadKey);
set => actionReadKey = value ?? ReadKey;
}
/// <summary>
/// Writes a character to console<br></br><br></br>
Expand All @@ -172,7 +172,7 @@ public static Func<bool, ConsoleKeyInfo> ActionReadKey
public static Action<char, TermReaderSettings> ActionWriteChar
{
get => actionWrite;
set => actionWrite = value ?? (Write);
set => actionWrite = value ?? Write;
}
/// <summary>
/// Writes text to console<br></br><br></br>
Expand All @@ -181,7 +181,7 @@ public static Action<char, TermReaderSettings> ActionWriteChar
public static Action<string, TermReaderSettings> ActionWriteString
{
get => actionWrite1;
set => actionWrite1 = value ?? (Write);
set => actionWrite1 = value ?? Write;
}
/// <summary>
/// Writes text to console<br></br><br></br>
Expand All @@ -191,15 +191,15 @@ public static Action<string, TermReaderSettings> ActionWriteString
public static Action<string, TermReaderSettings, object[]> ActionWriteParameterized
{
get => actionWrite2;
set => actionWrite2 = value ?? (Write);
set => actionWrite2 = value ?? Write;
}
/// <summary>
/// Writes new line to console
/// </summary>
public static Action ActionWriteLine
{
get => actionWriteLine;
set => actionWriteLine = value ?? (WriteLine);
set => actionWriteLine = value ?? WriteLine;
}
/// <summary>
/// Writes text to console with line terminator
Expand All @@ -208,7 +208,7 @@ public static Action ActionWriteLine
public static Action<string, TermReaderSettings> ActionWriteLineString
{
get => actionWriteLine1;
set => actionWriteLine1 = value ?? (WriteLine);
set => actionWriteLine1 = value ?? WriteLine;
}
/// <summary>
/// Writes text to console with line terminator
Expand All @@ -218,7 +218,7 @@ public static Action<string, TermReaderSettings> ActionWriteLineString
public static Action<string, TermReaderSettings, object[]> ActionWriteLineParameterized
{
get => actionWriteLine2;
set => actionWriteLine2 = value ?? (WriteLine);
set => actionWriteLine2 = value ?? WriteLine;
}

// Wrapper starts here
Expand Down Expand Up @@ -356,7 +356,7 @@ private static void SetCursorTop(int top)
Console.CursorTop = top;
}

private static void Beep() =>
private static void Beep() =>
Console.Beep();

private static ConsoleKeyInfo ReadKey(bool intercept = false) =>
Expand Down Expand Up @@ -384,7 +384,7 @@ private static void Write(string text, TermReaderSettings settings, params objec
Write(textc, settings);
}

private static void WriteLine() =>
private static void WriteLine() =>
Console.WriteLine();

private static void WriteLine(string text, TermReaderSettings settings)
Expand Down
Loading

0 comments on commit ed32a0d

Please sign in to comment.