-
Notifications
You must be signed in to change notification settings - Fork 18
ADFA-1414 Adding tooltips for java/kotlin operators #1067
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
680cf4a
Adding tooltips for java/kotlin operators
hal-eisen-adfa ec93898
Prepend kotlin.operator. to the operator symbol for later lookup in t…
hal-eisen-adfa b0ad64f
Add tooltip support for Java operators
hal-eisen-adfa 2e1efb1
Re-order >>>= and >>> so one does not shadow the other
hal-eisen-adfa 533379b
Merge branch 'stage' into ADFA-1414-tooltips-for-operators
hal-eisen-adfa 5264f02
Merge branch 'stage' into ADFA-1414-tooltips-for-operators
hal-eisen-adfa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 157 additions & 0 deletions
157
editor/src/main/java/com/itsaky/androidide/editor/utils/OperatorSelection.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| /* | ||
| * This file is part of AndroidIDE. | ||
| * | ||
| * AndroidIDE is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * AndroidIDE is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.itsaky.androidide.editor.utils | ||
|
|
||
| import io.github.rosemoe.sora.text.Content | ||
|
|
||
| /** | ||
| * Java/Kotlin operators for long-press selection, ordered by length descending | ||
| * so longer matches are tried first (e.g. `>>>=` before `>>>` before `>>` before `>`). | ||
| */ | ||
| private val OPERATORS: List<String> = | ||
| listOf( | ||
| // 4-char (`>>>=` must precede `>>>` — the latter is a prefix) | ||
| ">>>=", | ||
| // 3-char (=== and !== before 2-char == and !=) | ||
| "===", | ||
| "!==", | ||
| ">>>", | ||
| "<<=", | ||
| ">>=", | ||
| // 2-char | ||
| "==", | ||
| "!=", | ||
| "<=", | ||
| ">=", | ||
| "+=", | ||
| "-=", | ||
| "*=", | ||
| "/=", | ||
| "%=", | ||
| "&=", | ||
| "|=", | ||
| "^=", | ||
| "++", | ||
| "--", | ||
| "&&", | ||
| "||", | ||
| "<<", | ||
| ">>", | ||
| "->", | ||
| "?.", | ||
| "?:", | ||
| "..", | ||
| "!!", | ||
| "::", | ||
| // 1-char | ||
| "+", | ||
| "-", | ||
| "*", | ||
| "/", | ||
| "%", | ||
| "=", | ||
| "<", | ||
| ">", | ||
| "!", | ||
| "&", | ||
| "|", | ||
| "^", | ||
| "~", | ||
| "?", | ||
| ":", | ||
| ";", | ||
| ",", | ||
| ".", | ||
| "@", | ||
| "(", | ||
| ")", | ||
| "[", | ||
| "]", | ||
| "{", | ||
| "}", | ||
| ) | ||
hal-eisen-adfa marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| private val OPERATOR_SET: Set<String> = OPERATORS.toSet() | ||
|
|
||
| /** | ||
| * Tokens matched for editor selection that exist only in Kotlin, not Java. | ||
| * Used so [isJavaOperatorToken] does not emit `java.operator.*` tags for these. | ||
| */ | ||
| private val KOTLIN_ONLY_OPERATOR_TOKENS: Set<String> = | ||
| setOf( | ||
| "?.", | ||
| "?:", | ||
| "..", | ||
| "!!", | ||
| "===", | ||
| "!==", | ||
| ) | ||
|
|
||
| private val JAVA_OPERATOR_SET: Set<String> = OPERATOR_SET - KOTLIN_ONLY_OPERATOR_TOKENS | ||
|
|
||
| /** | ||
| * Returns true when [text] is exactly one Kotlin operator/punctuation token for tooltip lookup | ||
| * (same token set as the long-press operator list). | ||
| */ | ||
| fun isKotlinOperatorToken(text: CharSequence): Boolean { | ||
| if (text.isEmpty()) return false | ||
| return OPERATOR_SET.contains(text.toString()) | ||
| } | ||
|
|
||
| /** | ||
| * Returns true when [text] is exactly one Java operator/punctuation token for tooltip lookup. | ||
| * Excludes Kotlin-only tokens such as `?.`, `..`, `===`, and `!==`. | ||
| */ | ||
| fun isJavaOperatorToken(text: CharSequence): Boolean { | ||
| if (text.isEmpty()) return false | ||
| return JAVA_OPERATOR_SET.contains(text.toString()) | ||
| } | ||
|
|
||
| /** | ||
| * Returns the column range of the operator at the given position, if any. | ||
| * Columns are 0-based; endColumn is exclusive (one past the last character). | ||
| * | ||
| * @param lineContent The full line text. | ||
| * @param column Cursor column (0-based). | ||
| * @return (startColumn, endColumnExclusive) or null if no operator at this position. | ||
| */ | ||
| fun getOperatorRangeAt(lineContent: CharSequence, column: Int): Pair<Int, Int>? { | ||
| if (column < 0 || column >= lineContent.length) return null | ||
| val suffix = lineContent.subSequence(column, lineContent.length) | ||
| for (op in OPERATORS) { | ||
| if (op.length <= suffix.length && suffix.subSequence(0, op.length) == op) { | ||
| return column to (column + op.length) | ||
| } | ||
| } | ||
| return null | ||
| } | ||
hal-eisen-adfa marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * Returns the column range of the operator at (line, column) in [content], if any. | ||
| * Columns are 0-based; endColumn is exclusive. | ||
| */ | ||
| fun Content.getOperatorRangeAt(line: Int, column: Int): Pair<Int, Int>? { | ||
| if (line < 0 || line >= lineCount) return null | ||
| val lineContent = getLine(line) | ||
| val maxColumn = lineContent.length | ||
| if (column < 0 || column > maxColumn) return null | ||
| val range = getOperatorRangeAt(lineContent, column) ?: return null | ||
| val (start, end) = range | ||
| if (end > maxColumn) return null | ||
| return range | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.