Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Revert slow render option #35

Merged
merged 3 commits into from
Mar 21, 2024
Merged

Revert slow render option #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1acc3dd
Revert html rendering and fix freezing
Mar 21, 2024
b5a003b
Add change notes and up the version
Mar 21, 2024
5236623
Remove unusable setting
Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

group = "com.mituuz"
version = "0.17"
version = "0.18"

repositories {
mavenCentral()
Expand Down
4 changes: 0 additions & 4 deletions src/main/kotlin/com/mituuz/fuzzier/FuzzyAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,4 @@ abstract class FuzzyAction : AnAction() {
fun setFiletype(filenameType: FilenameType) {
fuzzierSettingsService.state.filenameType = filenameType
}

fun setBoldFilename(value: Boolean) {
fuzzierSettingsService.state.boldFilenameWithType = value
}
}
10 changes: 1 addition & 9 deletions src/main/kotlin/com/mituuz/fuzzier/StringEvaluator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,17 +170,9 @@ class StringEvaluator(
return when (filenameType) {
FilenameType.FILENAME_ONLY -> filename
FilenameType.FILEPATH_ONLY -> filePath
FilenameType.FILENAME_WITH_PATH -> getFilenameWithPathCustomized()
FilenameType.FILENAME_WITH_PATH -> "$filename ($filePath)"
}
}

private fun getFilenameWithPathCustomized(): String {
val settings = service<FuzzierSettingsService>().state
if (settings.boldFilenameWithType) {
return "<html><strong>$filename</strong> <i>($filePath)</i></html>"
}
return "<html>$filename <i>($filePath)</i></html>"
}
}

enum class FilenameType(val text: String) {
Expand Down
6 changes: 0 additions & 6 deletions src/main/kotlin/com/mituuz/fuzzier/components/FuzzierSettingsComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ class FuzzierSettingsComponent {
""".trimIndent(),
false)

val boldFilenameWithType = SettingsComponent(JBCheckBox(), "Bold filename when using: Filename with (path)")

val fontSize = SettingsComponent(JBIntSpinner(14, 4, 20), "File list font size",
"""
Controls the font size of the file list in the search and selector popups.
Expand Down Expand Up @@ -114,7 +112,6 @@ class FuzzierSettingsComponent {
.addComponent(newTabSelect)
.addComponent(debounceTimerValue)
.addComponent(filenameTypeSelector)
.addComponent(boldFilenameWithType)
.addComponent(fontSize)
.addComponent(fileListSpacing)

Expand All @@ -135,9 +132,6 @@ class FuzzierSettingsComponent {
multiMatchActive.getCheckBox().addChangeListener {
matchWeightSingleChar.getIntSpinner().isEnabled = multiMatchActive.getCheckBox().isSelected
}
filenameTypeSelector.getFilenameTypeComboBox().addActionListener {
boldFilenameWithType.getCheckBox().isEnabled = filenameTypeSelector.getFilenameTypeComboBox().selectedItem == FILENAME_WITH_PATH
}
exclusionList.component.border = LineBorder(JBColor.BLACK, 1)
resetWindowDimension.addActionListener {
service<FuzzierSettingsService>().state.resetWindow = true
Expand Down
4 changes: 0 additions & 4 deletions src/main/kotlin/com/mituuz/fuzzier/settings/FuzzierSettingsConfigurable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ class FuzzierSettingsConfigurable : Configurable {
fuzzierSettingsComponent.newTabSelect.getCheckBox().isSelected = fuzzierSettingsService.state.newTab
fuzzierSettingsComponent.debounceTimerValue.getIntSpinner().value = fuzzierSettingsService.state.debouncePeriod
fuzzierSettingsComponent.filenameTypeSelector.getFilenameTypeComboBox().selectedIndex = fuzzierSettingsService.state.filenameType.ordinal
fuzzierSettingsComponent.boldFilenameWithType.getCheckBox().isSelected = fuzzierSettingsService.state.boldFilenameWithType
fuzzierSettingsComponent.boldFilenameWithType.getCheckBox().isEnabled = fuzzierSettingsService.state.filenameType == FilenameType.FILENAME_WITH_PATH
fuzzierSettingsComponent.fontSize.getIntSpinner().value = fuzzierSettingsService.state.fontSize
fuzzierSettingsComponent.fileListSpacing.getIntSpinner().value = fuzzierSettingsService.state.fileListSpacing

Expand All @@ -42,7 +40,6 @@ class FuzzierSettingsConfigurable : Configurable {
|| fuzzierSettingsService.state.newTab != fuzzierSettingsComponent.newTabSelect.getCheckBox().isSelected
|| fuzzierSettingsService.state.debouncePeriod != fuzzierSettingsComponent.debounceTimerValue.getIntSpinner().value
|| fuzzierSettingsService.state.filenameType != fuzzierSettingsComponent.filenameTypeSelector.getFilenameTypeComboBox().selectedItem
|| fuzzierSettingsService.state.boldFilenameWithType != fuzzierSettingsComponent.boldFilenameWithType.getCheckBox().isSelected
|| fuzzierSettingsService.state.fontSize != fuzzierSettingsComponent.fontSize.getIntSpinner().value
|| fuzzierSettingsService.state.fileListSpacing != fuzzierSettingsComponent.fileListSpacing.getIntSpinner().value

Expand All @@ -62,7 +59,6 @@ class FuzzierSettingsConfigurable : Configurable {
fuzzierSettingsService.state.newTab = fuzzierSettingsComponent.newTabSelect.getCheckBox().isSelected
fuzzierSettingsService.state.debouncePeriod = fuzzierSettingsComponent.debounceTimerValue.getIntSpinner().value as Int
fuzzierSettingsService.state.filenameType = FilenameType.entries.toTypedArray()[fuzzierSettingsComponent.filenameTypeSelector.getFilenameTypeComboBox().selectedIndex]
fuzzierSettingsService.state.boldFilenameWithType = fuzzierSettingsComponent.boldFilenameWithType.getCheckBox().isSelected
fuzzierSettingsService.state.fontSize = fuzzierSettingsComponent.fontSize.getIntSpinner().value as Int
fuzzierSettingsService.state.fileListSpacing = fuzzierSettingsComponent.fileListSpacing.getIntSpinner().value as Int

Expand Down
1 change: 0 additions & 1 deletion src/main/kotlin/com/mituuz/fuzzier/settings/FuzzierSettingsService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class FuzzierSettingsService : PersistentStateComponent<FuzzierSettingsService.S
var resetWindow = false
var multiMatch = false
var filenameType: FilenameType = FilenameType.FILEPATH_ONLY
var boldFilenameWithType = true
var fontSize = 14
var fileListSpacing = 0

Expand Down
7 changes: 1 addition & 6 deletions src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,7 @@
</extensions>

<change-notes><![CDATA[
<h2>Add options to visually modify the file list:</h2>
<ul>
<li>Change font size</li>
<li>Use bold to mark filename when using filename with (path)</li>
<li>Change row spacing</li>
</ul>
Revert html parsing and fix freezing issue when using Filename with (path). Have to take another look how to do this properly.
]]>
</change-notes>

Expand Down
19 changes: 1 addition & 18 deletions src/test/kotlin/com/mituuz/fuzzier/FuzzyActionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ class FuzzyActionTest {
fun `Check renderer with path`() {
val action = getAction()
action.setFiletype(FILENAME_WITH_PATH)
action.setBoldFilename(false)
val myFixture: CodeInsightTestFixture = testUtil.setUpProject(emptyList())
val project = myFixture.project
action.component = SimpleFinderComponent(project)
Expand All @@ -93,23 +92,7 @@ class FuzzyActionTest {
val dummyList = JList<FuzzyMatchContainer>()
val component = renderer.getListCellRendererComponent(dummyList, container, 0, false, false) as JLabel
assertNotNull(component)
assertEquals("<html>asd <i>(/src/asd)</i></html>", component.text)
}

@Test
fun `Check renderer with path strong filename`() {
val action = getAction()
action.setFiletype(FILENAME_WITH_PATH)
action.setBoldFilename(true)
val myFixture: CodeInsightTestFixture = testUtil.setUpProject(emptyList())
val project = myFixture.project
action.component = SimpleFinderComponent(project)
val renderer = action.getCellRenderer()
val container = FuzzyMatchContainer(1, "/src/asd", "asd")
val dummyList = JList<FuzzyMatchContainer>()
val component = renderer.getListCellRendererComponent(dummyList, container, 0, false, false) as JLabel
assertNotNull(component)
assertEquals("<html><strong>asd</strong> <i>(/src/asd)</i></html>", component.text)
assertEquals("asd (/src/asd)", component.text)
}

@Test
Expand Down
Loading