Skip to content

Commit efaeb04

Browse files
itsakyitsaky
committed
refactor(logger): rename ILogger.Priority to ILogger.Level
1 parent 2e36388 commit efaeb04

File tree

18 files changed

+95
-103
lines changed

18 files changed

+95
-103
lines changed

‎app/src/main/java/com/itsaky/androidide/fragments/output/IDELogFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ import com.itsaky.androidide.utils.ILogger
2929
class IDELogFragment : LogViewFragment() {
3030

3131
private var logListener: ILogger.LogListener? =
32-
ILogger.LogListener { priority, tag, message ->
32+
ILogger.LogListener { level, tag, message ->
3333
if (message.contains("\n")) {
3434
val split = message.split("\n").toTypedArray()
3535
for (line in split) {
36-
logLine(priority, tag, line)
36+
logLine(level, tag, line)
3737
}
3838
} else {
39-
logLine(priority, tag, message)
39+
logLine(level, tag, message)
4040
}
4141
}
4242

‎app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import com.itsaky.androidide.editor.schemes.IDEColorSchemeProvider
2929
import com.itsaky.androidide.fragments.EmptyStateFragment
3030
import com.itsaky.androidide.models.LogLine
3131
import com.itsaky.androidide.utils.ILogger
32-
import com.itsaky.androidide.utils.ILogger.Priority
32+
import com.itsaky.androidide.utils.ILogger.Level
3333
import com.itsaky.androidide.utils.jetbrainsMono
3434
import io.github.rosemoe.sora.widget.style.CursorAnimator
3535
import java.util.concurrent.ArrayBlockingQueue
@@ -195,8 +195,8 @@ abstract class LogViewFragment :
195195

196196
abstract fun isSimpleFormattingEnabled(): Boolean
197197

198-
protected open fun logLine(priority: Priority, tag: String, message: String) {
199-
val line = LogLine.obtain(priority, tag, message)
198+
protected open fun logLine(level: Level, tag: String, message: String) {
199+
val line = LogLine.obtain(level, tag, message)
200200
appendLog(line)
201201
}
202202

‎app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ class GradleBuildService : Service(), BuildService, IToolingApiClient,
236236

237237
override fun logMessage(params: LogMessageParams) {
238238
val line = params.toLogLine()
239-
serverLogger.log(line.priority, line.formattedTagAndMessage())
239+
serverLogger.log(line.level, line.formattedTagAndMessage())
240240
}
241241

242242
override fun logOutput(line: String) {

‎changelogs/v2.1.0-beta.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ AndroidIDE v2.0.0-beta is here with new features, improvements, bug fixes and a
4141
- `Import orderer`: Organizes the imports. Thanks to @MrIkso (#180).
4242
- XML Code formatter. Thanks to @MrIkso (#182).
4343
- New Gradle command line options: `--build-cache` and `--offline`. Thanks to @MrIkso (#180).
44-
- Highlight IDE logs based on the log line priority.
44+
- Highlight IDE logs based on the log line level.
4545
- Option to share Build Output, App log and IDE logs as text file.
4646
- Syntax highlighting for Kotlin and C/C++ language. Thanks to @MrIkso (#196).
4747
- Highlight hex color code in string literals. Thanks to @MrIkso (#209).

‎changelogs/v2.1.2-beta.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Following issues have been fixed in this release :
5656
- Hide tab layout when no files are opened (#330).
5757
- Do not show full error message when layout inflation fails (#274).
5858
- Use Storage Access Framework (SAF) for picking directories.
59-
- 'Preview layout' item now has more priority than other options menu icons (#243).
59+
- 'Preview layout' item now has more level than other options menu icons (#243).
6060
- Do not show editor actions window when in search mode.
6161
- Use relative padding in TreeView to support RTL layouts.
6262
- Updated crash report. By @AndreyKozhev (#460).

‎changelogs/v2.4.0-beta.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ _No notes_
3535
## Improvements
3636

3737
- Improved colors in editor windows.
38-
- Signture help window is now given more priority over the diagnostics window. This means, if the signature help window is visible to the user, the diagnostics window will not be shown.
38+
- Signture help window is now given more level over the diagnostics window. This means, if the signature help window is visible to the user, the diagnostics window will not be shown.
3939
- The IDE now releases some unnecessary resources when a file is deleted or renamed.

‎editor/src/main/assets/editor/treesitter/log/highlights.scm‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,87 +5,87 @@
55
(time) @err.time
66
(pid) @err.pid
77
(tid) @err.tid
8-
(priority) @err.priority
8+
(level) @err.level
99
(tag) @err.tag
1010
(message) @err.msg
11-
(#match? @err.priority "E")
11+
(#match? @err.level "E")
1212
)
1313

1414
(log_line
1515
(date) @warn.date
1616
(time) @warn.time
1717
(pid) @warn.pid
1818
(tid) @warn.tid
19-
(priority) @warn.priority
19+
(level) @warn.level
2020
(tag) @warn.tag
2121
(message) @warn.msg
22-
(#match? @warn.priority "W")
22+
(#match? @warn.level "W")
2323
)
2424

2525
(log_line
2626
(date) @info.date
2727
(time) @info.time
2828
(pid) @info.pid
2929
(tid) @info.tid
30-
(priority) @info.priority
30+
(level) @info.level
3131
(tag) @info.tag
3232
(message) @info.msg
33-
(#match? @info.priority "I")
33+
(#match? @info.level "I")
3434
)
3535

3636
(log_line
3737
(date) @debug.date
3838
(time) @debug.time
3939
(pid) @debug.pid
4040
(tid) @debug.tid
41-
(priority) @debug.priority
41+
(level) @debug.level
4242
(tag) @debug.tag
4343
(message) @debug.msg
44-
(#match? @debug.priority "D")
44+
(#match? @debug.level "D")
4545
)
4646

4747
(log_line
4848
(date) @verbose.date
4949
(time) @verbose.time
5050
(pid) @verbose.pid
5151
(tid) @verbose.tid
52-
(priority) @verbose.priority
52+
(level) @verbose.level
5353
(tag) @verbose.tag
5454
(message) @verbose.msg
55-
(#match? @verbose.priority "V")
55+
(#match? @verbose.level "V")
5656
)
5757

5858
(ide_log_line
5959
(ide_tag) @err.tag
60-
(priority) @err.priority
60+
(level) @err.level
6161
(message) @err.msg
62-
(#match? @err.priority "E")
62+
(#match? @err.level "E")
6363
)
6464

6565
(ide_log_line
6666
(ide_tag) @warn.tag
67-
(priority) @warn.priority
67+
(level) @warn.level
6868
(message) @warn.msg
69-
(#match? @warn.priority "W")
69+
(#match? @warn.level "W")
7070
)
7171

7272
(ide_log_line
7373
(ide_tag) @info.tag
74-
(priority) @info.priority
74+
(level) @info.level
7575
(message) @info.msg
76-
(#match? @info.priority "I")
76+
(#match? @info.level "I")
7777
)
7878

7979
(ide_log_line
8080
(ide_tag) @debug.tag
81-
(priority) @debug.priority
81+
(level) @debug.level
8282
(message) @debug.msg
83-
(#match? @debug.priority "D")
83+
(#match? @debug.level "D")
8484
)
8585

8686
(ide_log_line
8787
(ide_tag) @verbose.tag
88-
(priority) @verbose.priority
88+
(level) @verbose.level
8989
(message) @verbose.msg
90-
(#match? @verbose.priority "V")
90+
(#match? @verbose.level "V")
9191
)

‎logger/src/main/java/com/itsaky/androidide/utils/AndroidLogger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ protected AndroidLogger(String tag) {
3131
}
3232

3333
@Override
34-
protected void doLog(Priority priority, String message) {
35-
switch (priority) {
34+
protected void doLog(Level level, String message) {
35+
switch (level) {
3636
case ERROR:
3737
Log.e(TAG, message);
3838
break;

‎logger/src/main/java/com/itsaky/androidide/utils/ILogger.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -97,45 +97,45 @@ public static ILogger newInstance(String tag) {
9797
* @return This logger instance.
9898
*/
9999
public ILogger error(Object... messages) {
100-
return log(Priority.ERROR, messages);
100+
return log(Level.ERROR, messages);
101101
}
102102

103103
/**
104-
* Log messages with the given priority.
104+
* Log messages with the given log level.
105105
*
106-
* @param priority The priority of the log messages.
106+
* @param level The log level of the messages.
107107
* @param messages The messages to log.
108108
* @return This logger instance.
109109
*/
110-
public ILogger log(Priority priority, Object... messages) {
111-
logAndNotify(priority, generateMessage(messages));
110+
public ILogger log(Level level, Object... messages) {
111+
logAndNotify(level, generateMessage(messages));
112112
return this;
113113
}
114114

115-
private void logAndNotify(Priority priority, String msg) {
115+
private void logAndNotify(Level level, String msg) {
116116
if (!isEnabled()) {
117117
// logger is disabled
118118
return;
119119
}
120120

121-
doLog(priority, msg);
121+
doLog(level, msg);
122122
for (final var listener : logListeners) {
123-
listener.log(priority, TAG, msg);
123+
listener.log(level, TAG, msg);
124124
}
125125
}
126126

127127
/**
128128
* Log the message to an appropriate stream where the user can see the log messages.
129129
*
130-
* @param priority The priority for this log message.
131-
* @param message The full generated message for this log. Might contain new lines.
132-
* @see ILogger.Priority#DEBUG
133-
* @see ILogger.Priority#ERROR
134-
* @see ILogger.Priority#WARNING
135-
* @see ILogger.Priority#VERBOSE
136-
* @see ILogger.Priority#INFO
130+
* @param level The log level for this message.
131+
* @param message The full generated message for this log. Might contain new lines.
132+
* @see Level#DEBUG
133+
* @see Level#ERROR
134+
* @see Level#WARNING
135+
* @see Level#VERBOSE
136+
* @see Level#INFO
137137
*/
138-
protected abstract void doLog(Priority priority, String message);
138+
protected abstract void doLog(Level level, String message);
139139

140140
protected String generateMessage(Object... messages) {
141141
StringBuilder sb = new StringBuilder();
@@ -159,7 +159,7 @@ protected String generateMessage(Object... messages) {
159159
* @return This logger instance.
160160
*/
161161
public ILogger warn(Object... messages) {
162-
return log(Priority.WARNING, messages);
162+
return log(Level.WARNING, messages);
163163
}
164164

165165
/**
@@ -169,7 +169,7 @@ public ILogger warn(Object... messages) {
169169
* @return This logger instance.
170170
*/
171171
public ILogger verbose(Object... messages) {
172-
return log(Priority.VERBOSE, messages);
172+
return log(Level.VERBOSE, messages);
173173
}
174174

175175
/**
@@ -179,7 +179,7 @@ public ILogger verbose(Object... messages) {
179179
* @return This logger instance.
180180
*/
181181
public ILogger info(Object... messages) {
182-
return log(Priority.INFO, messages);
182+
return log(Level.INFO, messages);
183183
}
184184

185185
/**
@@ -196,7 +196,7 @@ public void logThis() {
196196
* @return This logger instance.
197197
*/
198198
public ILogger debug(Object... messages) {
199-
return log(Priority.DEBUG, messages);
199+
return log(Level.DEBUG, messages);
200200
}
201201

202202
/**
@@ -234,31 +234,31 @@ protected String getCallerClassDescription() {
234234
}
235235

236236
/**
237-
* Logging priority.
237+
* Logging level.
238238
*/
239-
public enum Priority {
239+
public enum Level {
240240

241241
DEBUG('D'),
242242
WARNING('W'),
243243
ERROR('E'),
244244
INFO('I'),
245245
VERBOSE('V');
246246

247-
public final char priorityChar;
247+
public final char levelChar;
248248

249-
Priority(char priorityChar) {
250-
this.priorityChar = priorityChar;
249+
Level(char levelChar) {
250+
this.levelChar = levelChar;
251251
}
252252

253-
public static Priority forChar(char c) {
253+
public static Level forChar(char c) {
254254
c = Character.toUpperCase(c);
255-
for (Priority value : values()) {
256-
if (value.priorityChar == c) {
255+
for (Level value : values()) {
256+
if (value.levelChar == c) {
257257
return value;
258258
}
259259
}
260260

261-
throw new IllegalArgumentException("Invalid priority char " + c);
261+
throw new IllegalArgumentException("Invalid level char " + c);
262262
}
263263
}
264264

@@ -267,6 +267,6 @@ public static Priority forChar(char c) {
267267
*/
268268
public interface LogListener {
269269

270-
void log(Priority priority, String tag, String message);
270+
void log(Level level, String tag, String message);
271271
}
272272
}

‎logger/src/main/java/com/itsaky/androidide/utils/JvmLogger.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ protected JvmLogger(String tag) {
3333
}
3434

3535
@Override
36-
protected void doLog(Priority priority, String message) {
36+
protected void doLog(Level level, String message) {
3737
if (interceptor != null) {
38-
interceptor.onLog(priority, TAG, message);
38+
interceptor.onLog(level, TAG, message);
3939
} else {
4040
System.err.printf(
4141
"%-25s %-2s %s%n",
4242
trimTagIfNeeded(TAG, 25),
43-
priority.priorityChar,
43+
level.levelChar,
4444
message
4545
);
4646
}
4747
}
4848

4949
public interface LogInterceptor {
5050

51-
void onLog(Priority priority, String tag, String message);
51+
void onLog(Level level, String tag, String message);
5252
}
5353
}

0 commit comments

Comments
 (0)