From 67aad580fdccbed96c9de4bd4be58053a4b79d04 Mon Sep 17 00:00:00 2001 From: Francisco N <4259909+francisconoriega@users.noreply.github.com> Date: Fri, 30 Aug 2024 00:41:52 -0600 Subject: [PATCH 01/13] Fixed Null Pointer in IDE sample on non INTUI themes (#568) Co-authored-by: Francisco Noriega --- .../jewel/samples/ideplugin/ComponentShowcaseTab.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt index c23cc9bfc5..84e35d2212 100644 --- a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt +++ b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/ComponentShowcaseTab.kt @@ -238,6 +238,8 @@ private fun RowScope.ColumnOne() { @Composable private fun IconsShowcase() { + val iconBackgroundColor = JewelTheme.colorPalette.blueOrNull(4) ?: JBUI.CurrentTheme.Banner.INFO_BACKGROUND.toComposeColor() + Row( modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp), horizontalArrangement = Arrangement.spacedBy(16.dp), @@ -251,14 +253,14 @@ private fun IconsShowcase() { } Box( - Modifier.size(24.dp).background(JewelTheme.colorPalette.blue(4), shape = RoundedCornerShape(4.dp)), + Modifier.size(24.dp).background(iconBackgroundColor, shape = RoundedCornerShape(4.dp)), contentAlignment = Alignment.Center, ) { PlatformIcon(AllIconsKeys.Nodes.ConfigFolder, "taskGroup", hint = Stroke(Color.White)) } Box( - Modifier.size(24.dp).background(JewelTheme.colorPalette.blue(4), shape = RoundedCornerShape(4.dp)), + Modifier.size(24.dp).background(iconBackgroundColor, shape = RoundedCornerShape(4.dp)), contentAlignment = Alignment.Center, ) { PlatformIcon( From 008d9696fe7c0b83bd778dff4f12151144aa23c3 Mon Sep 17 00:00:00 2001 From: Ivan Morgillo Date: Fri, 30 Aug 2024 10:46:03 +0200 Subject: [PATCH 02/13] Fix global border colors (#569) fix global border colors Signed-off-by: Ivan Morgillo --- .../jewel/intui/standalone/theme/IntUiGlobalColors.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt index a7768185cc..3e06646f06 100644 --- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt +++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt @@ -39,14 +39,14 @@ public fun GlobalColors.Companion.dark( @Composable public fun BorderColors.Companion.light( - normal: Color = IntUiLightTheme.colors.gray(9), + normal: Color = IntUiLightTheme.colors.gray(12), focused: Color = IntUiLightTheme.colors.gray(14), disabled: Color = IntUiLightTheme.colors.gray(11), ): BorderColors = BorderColors(normal, focused, disabled) @Composable public fun BorderColors.Companion.dark( - normal: Color = IntUiDarkTheme.colors.gray(5), + normal: Color = IntUiDarkTheme.colors.gray(1), focused: Color = IntUiDarkTheme.colors.gray(2), disabled: Color = IntUiDarkTheme.colors.gray(4), ): BorderColors = BorderColors(normal, focused, disabled) From fc4c9cbba9303830725e3960e33c05f507429609 Mon Sep 17 00:00:00 2001 From: Sebastiano Poggi Date: Tue, 3 Sep 2024 15:53:48 +0200 Subject: [PATCH 03/13] Use ktfmt for formatting (#571) * Format with ktfmt, use ktlint for inspections only * Make ktlint plugin required again, but set to manual * Make ktlint not used for formatting in IDE * Make ktfmt plugin required, used for formatting in IDE * Make pre-push run config use ktfmt * Add ktfmt Gradle plugin * ktfmt uses kotlinlang style both in IDE and Gradle * Upgrade ktfmt Gradle plugin, set style Also sets a minimum version for the ktfmt plugin that supports custom styles, and stores our style. * Make Kotlin and KDoc formatter plugins required * Upgrade kotlinter plugin to latest version * Use ktfmt to reformat project in run config * Add git hook for pre-push to ensure correct formatting * Format with ktfmt (#572) * Reformat everything with ktfmt * Don't nag about ktlint suppressions in .editorconfig * Suppress ktlint checks that clash with ktfmt * Disable MergeSarifTask for now * Disable upload-sarif CI step for now --- .editorconfig | 19 +- .github/workflows/build.yml | 10 +- .gitignore | 2 + .idea/externalDependencies.xml | 4 + .idea/inspectionProfiles/Project_Default.xml | 5 +- .idea/ktfmt.xml | 11 + .idea/ktlint-plugin.xml | 7 + .idea/runConfigurations/Pre_push.xml | 2 +- .idea/runConfigurations/Reformat_project.xml | 2 +- build.gradle.kts | 97 +- buildSrc/build.gradle.kts | 17 +- buildSrc/settings.gradle.kts | 6 +- buildSrc/src/main/kotlin/MergeSarifTask.kt | 43 +- .../src/main/kotlin/PublishConfiguration.kt | 4 +- .../src/main/kotlin/ValidatePublicApiTask.kt | 47 +- ...droid-studio-releases-generator.gradle.kts | 3 +- .../kotlin/icon-keys-generator.gradle.kts | 119 +- .../intellij-theme-generator.gradle.kts | 9 +- .../kotlin/jewel-check-public-api.gradle.kts | 17 +- .../src/main/kotlin/jewel-linting.gradle.kts | 9 + .../src/main/kotlin/jewel-publish.gradle.kts | 28 +- buildSrc/src/main/kotlin/jewel.gradle.kts | 58 +- .../demodata/AndroidStudioReleases.kt | 44 +- .../demodata/AndroidStudioReleasesReader.kt | 94 +- .../demodata/ApiAndroidStudioReleases.kt | 4 +- .../ideversion/CheckIdeaVersionTask.kt | 50 +- .../buildlogic/ideversion/CurrentIjpTarget.kt | 4 +- .../ideversion/IJPVersionsFetcher.kt | 22 +- .../theme/IntUiThemeDescriptorReader.kt | 60 +- .../theme/IntelliJThemeGeneratorPlugin.kt | 25 +- .../jetbrains/jewel/window/DecoratedWindow.kt | 47 +- .../org/jetbrains/jewel/window/Theme.kt | 6 +- .../jetbrains/jewel/window/TitleBar.Linux.kt | 50 +- .../jetbrains/jewel/window/TitleBar.MacOS.kt | 10 +- .../org/jetbrains/jewel/window/TitleBar.kt | 44 +- .../window/styling/DecoratedWindowStyling.kt | 14 +- .../jewel/window/styling/TitleBarStyling.kt | 9 +- .../jewel/window/utils/DesktopPlatform.kt | 3 +- .../jetbrains/jewel/window/utils/JnaLoader.kt | 4 +- .../jewel/window/utils/UnsafeAccessing.kt | 18 +- .../jewel/window/utils/macos/Foundation.kt | 79 +- .../window/utils/macos/FoundationLibrary.kt | 70 +- .../jetbrains/jewel/window/utils/macos/ID.kt | 9 +- .../jewel/window/utils/macos/MacUtil.kt | 11 +- foundation/build.gradle.kts | 4 +- .../jewel/foundation/Compatibility.kt | 11 +- .../jewel/foundation/GenerateDataFunctions.kt | 10 +- .../jewel/foundation/GlobalColors.kt | 13 +- .../jewel/foundation/GlobalMetrics.kt | 12 +- .../org/jetbrains/jewel/foundation/Stroke.kt | 20 +- .../actionSystem/DataProviderContext.kt | 10 +- .../actionSystem/DataProviderElement.kt | 5 +- .../actionSystem/DataProviderNode.kt | 5 +- .../foundation/actionSystem/ProvideData.kt | 13 +- .../jewel/foundation/lazy/Keybindings.kt | 60 +- .../lazy/SelectableColumnOnKeyEvent.kt | 147 +- .../foundation/lazy/SelectableLazyColumn.kt | 73 +- .../lazy/SelectableLazyListScope.kt | 31 +- .../lazy/SelectableLazyListState.kt | 83 +- .../foundation/lazy/tree/BasicLazyTree.kt | 143 +- .../jewel/foundation/lazy/tree/BuildTree.kt | 109 +- .../lazy/tree/DefaultTreeViewKeybindings.kt | 24 +- .../lazy/tree/DefaultTreeViewOnKeyEvent.kt | 24 +- .../jewel/foundation/lazy/tree/KeyActions.kt | 76 +- .../jewel/foundation/lazy/tree/Tree.kt | 59 +- .../jewel/foundation/lazy/tree/TreeState.kt | 5 +- .../lazy/tree/TreeViewOnKeyEvent.kt | 18 +- .../jewel/foundation/modifier/Activation.kt | 17 +- .../jewel/foundation/modifier/Border.kt | 225 +- .../state/FocusableComponentState.kt | 9 +- .../jewel/foundation/theme/JewelTheme.kt | 130 +- .../foundation/theme/ThemeColorPalette.kt | 6 +- .../jewel/foundation/theme/ThemeIconData.kt | 6 +- .../jewel/foundation/util/JewelLogger.kt | 203 +- .../lazy/SelectableLazyColumnTest.kt | 381 +-- gradle/libs.versions.toml | 5 +- ide-laf-bridge-tests/build.gradle.kts | 12 +- .../bridge/actionSystem/ProvideDataTest.kt | 19 +- .../jewel/bridge/actionSystem/TestDataSink.kt | 10 +- ide-laf-bridge/build.gradle.kts | 16 +- .../org/jetbrains/jewel/bridge/Bridge.kt | 15 +- .../jetbrains/jewel/bridge/BridgeOverride.kt | 9 +- .../bridge/BridgePainterHintsProvider.kt | 32 +- .../jewel/bridge/BridgeResourceResolver.kt | 10 +- .../org/jetbrains/jewel/bridge/BridgeUtils.kt | 34 +- .../jewel/bridge/JewelBridgeException.kt | 2 +- .../jewel/bridge/JewelComposePanel.kt | 35 +- .../jetbrains/jewel/bridge/ScrollbarHelper.kt | 39 +- .../jewel/bridge/SwingBridgeService.kt | 45 +- .../org/jetbrains/jewel/bridge/Typography.kt | 21 +- .../jewel/bridge/UiThemeExtensions.kt | 3 +- .../ComponentDataProviderBridge.kt | 4 +- .../DataProviderDataSinkContext.kt | 14 +- .../jewel/bridge/theme/BridgeSliderStyling.kt | 3 +- .../bridge/theme/BridgeThemeColorPalette.kt | 25 +- .../jewel/bridge/theme/IntUiBridge.kt | 177 +- .../jewel/bridge/theme/ScrollbarBridge.kt | 4 +- .../IntUiDecoratedWindowResourceResolver.kt | 4 +- .../jewel/intui/window/IntUiTheme.kt | 20 +- .../styling/IntUiDecoratedWindowStyling.kt | 3 +- .../window/styling/IntUiTitleBarStyling.kt | 48 +- .../intui/standalone/JetBrainsMonoFont.kt | 36 +- .../jewel/intui/standalone/PainterProvider.kt | 8 +- .../StandalonePainterHintsProvider.kt | 38 +- .../styling/IntUiCheckboxStyling.kt | 10 +- .../styling/IntUiCircularProgressStyling.kt | 7 +- .../styling/IntUiDropdownStyling.kt | 3 +- .../styling/IntUiGroupHeaderStyling.kt | 12 +- .../IntUiHorizontalProgressBarStyling.kt | 4 +- .../styling/IntUiLazyTreeStyling.kt | 8 +- .../standalone/styling/IntUiMenuStyling.kt | 33 +- .../styling/IntUiRadioButtonStyling.kt | 10 +- .../styling/IntUiScrollbarStyling.kt | 4 +- .../IntUiSegmentedControlButtonStyling.kt | 7 +- .../standalone/styling/IntUiSliderStyling.kt | 3 +- .../styling/IntUiTabStripScrollbarStyling.kt | 2 +- .../standalone/styling/IntUiTooltipStyling.kt | 18 +- .../standalone/theme/IntUiGlobalColors.kt | 16 +- .../standalone/theme/IntUiGlobalMetrics.kt | 6 +- .../intui/standalone/theme/IntUiTheme.kt | 28 +- .../jewel/markdown/InlineMarkdown.kt | 30 +- .../org/jetbrains/jewel/markdown/Markdown.kt | 11 +- .../jetbrains/jewel/markdown/MarkdownBlock.kt | 21 +- .../org/jetbrains/jewel/markdown/MimeType.kt | 137 +- .../jewel/markdown/extensions/Markdown.kt | 21 +- .../MarkdownBlockProcessorExtension.kt | 12 +- .../MarkdownBlockRendererExtension.kt | 9 +- .../MarkdownInlineProcessorExtension.kt | 10 +- .../MarkdownInlineRendererExtension.kt | 15 +- .../extensions/MarkdownProcessorExtension.kt | 27 +- .../extensions/MarkdownRendererExtension.kt | 16 +- .../processing/MarkdownParserFactory.kt | 22 +- .../markdown/processing/MarkdownProcessor.kt | 124 +- .../markdown/processing/ProcessingUtil.kt | 163 +- .../DefaultInlineMarkdownRenderer.kt | 27 +- .../rendering/DefaultMarkdownBlockRenderer.kt | 65 +- .../rendering/InlineMarkdownRenderer.kt | 5 +- .../rendering/MarkdownBlockRenderer.kt | 41 +- .../markdown/rendering/MarkdownStyling.kt | 36 +- ...rkdownProcessorDocumentParsingExtraTest.kt | 61 +- .../MarkdownProcessorDocumentParsingTest.kt | 3007 +++++------------ .../org/jetbrains/jewel/markdown/TestUtils.kt | 131 +- .../MarkdownProcessorOptimizeEditsTest.kt | 112 +- .../autolink/AutolinkProcessorExtension.kt | 3 +- .../github/alerts/GitHubAlertBlockRenderer.kt | 43 +- .../alerts/GitHubAlertProcessorExtension.kt | 21 +- .../alerts/GitHubAlertBlockExtensionTest.kt | 97 +- .../ide-laf-bridge-styling/build.gradle.kts | 8 +- .../bridge/BridgeProvideMarkdownStyling.kt | 6 +- .../bridge/styling/BridgeMarkdownStyling.kt | 71 +- .../styling/IntUiMarkdownStyling.kt | 124 +- samples/ide-plugin/build.gradle.kts | 18 +- .../src/main/kotlin/icons/JewelIcons.kt | 3 +- .../samples/ideplugin/ComponentShowcaseTab.kt | 173 +- .../ideplugin/JewelDemoToolWindowFactory.kt | 24 +- .../ideplugin/ScrollbarsShowcaseTab.kt | 2 +- .../ideplugin/SwingComparisonTabPanel.kt | 147 +- .../ideplugin/dialog/JewelDemoAction.kt | 20 +- .../ideplugin/dialog/WizardDialogWrapper.kt | 31 +- .../releasessample/AndroidStudioReleases.kt | 3 +- .../ideplugin/releasessample/ContentItem.kt | 3 +- .../ideplugin/releasessample/ContentSource.kt | 6 +- .../ideplugin/releasessample/FoilModifier.kt | 17 +- .../releasessample/ReleaseChannel.kt | 5 +- .../releasessample/ReleasesSampleCompose.kt | 150 +- .../releasessample/ReleasesSampleService.kt | 12 +- samples/standalone/build.gradle.kts | 10 +- .../jewel/samples/standalone/IntUiThemes.kt | 3 +- .../jewel/samples/standalone/Main.kt | 64 +- .../standalone/StandaloneSampleIcons.kt | 3 +- .../samples/standalone/view/ComponentsView.kt | 7 +- .../samples/standalone/view/MarkdownView.kt | 10 +- .../samples/standalone/view/TitleBarView.kt | 69 +- .../samples/standalone/view/WelcomeView.kt | 17 +- .../standalone/view/component/Borders.kt | 81 +- .../standalone/view/component/Buttons.kt | 42 +- .../standalone/view/component/Checkboxes.kt | 67 +- .../standalone/view/component/ChipsAndTree.kt | 90 +- .../standalone/view/component/Dropdowns.kt | 152 +- .../standalone/view/component/Links.kt | 34 +- .../standalone/view/component/ProgressBar.kt | 27 +- .../standalone/view/component/RadioButtons.kt | 32 +- .../standalone/view/component/Scrollbars.kt | 21 +- .../view/component/SegmentedControls.kt | 14 +- .../standalone/view/component/Slider.kt | 26 +- .../samples/standalone/view/component/Tabs.kt | 10 +- .../standalone/view/component/TextAreas.kt | 5 +- .../standalone/view/component/TextFields.kt | 48 +- .../standalone/view/component/Tooltips.kt | 4 +- .../standalone/view/markdown/JewelReadme.kt | 3 +- .../view/markdown/MarkdownEditor.kt | 41 +- .../view/markdown/MarkdownPreview.kt | 20 +- .../viewmodel/ComponentsViewModel.kt | 66 +- .../standalone/viewmodel/MainViewModel.kt | 3 +- settings.gradle.kts | 45 + ui/build.gradle.kts | 4 +- .../jetbrains/jewel/ui/ComponentStyling.kt | 30 +- .../kotlin/org/jetbrains/jewel/ui/Outline.kt | 8 +- .../jewel/ui/component/ActionButton.kt | 28 +- .../jetbrains/jewel/ui/component/Button.kt | 19 +- .../jetbrains/jewel/ui/component/Checkbox.kt | 41 +- .../org/jetbrains/jewel/ui/component/Chip.kt | 21 +- .../ui/component/CircularProgressIndicator.kt | 99 +- .../jewel/ui/component/ContextMenu.kt | 37 +- .../jetbrains/jewel/ui/component/Divider.kt | 6 +- .../jetbrains/jewel/ui/component/Dropdown.kt | 31 +- .../org/jetbrains/jewel/ui/component/Icon.kt | 153 +- .../jewel/ui/component/IconActionButton.kt | 43 +- .../jewel/ui/component/IconButton.kt | 139 +- .../jewel/ui/component/InputField.kt | 6 +- .../jetbrains/jewel/ui/component/LazyTree.kt | 7 +- .../jewel/ui/component/LinearProgressBar.kt | 58 +- .../org/jetbrains/jewel/ui/component/Link.kt | 63 +- .../org/jetbrains/jewel/ui/component/Menu.kt | 265 +- .../jewel/ui/component/MenuManager.kt | 20 +- .../org/jetbrains/jewel/ui/component/Popup.kt | 19 +- .../jewel/ui/component/RadioButton.kt | 36 +- .../jewel/ui/component/ScrollableContainer.kt | 2 +- .../jetbrains/jewel/ui/component/Scrollbar.kt | 2 +- .../jewel/ui/component/SegmentedControl.kt | 59 +- .../ui/component/SegmentedControlButton.kt | 41 +- .../jetbrains/jewel/ui/component/Slider.kt | 277 +- .../jewel/ui/component/SplitLayout.kt | 52 +- .../jetbrains/jewel/ui/component/TabStrip.kt | 36 +- .../org/jetbrains/jewel/ui/component/Tabs.kt | 47 +- .../org/jetbrains/jewel/ui/component/Text.kt | 14 +- .../jetbrains/jewel/ui/component/Tooltip.kt | 22 +- .../jewel/ui/component/Typography.kt | 61 +- .../ui/component/styling/ButtonStyling.kt | 20 +- .../ui/component/styling/CheckboxStyling.kt | 13 +- .../jewel/ui/component/styling/ChipStyling.kt | 18 +- .../styling/CircularProgressStyle.kt | 12 +- .../ui/component/styling/DividerStyling.kt | 23 +- .../ui/component/styling/DropdownStyling.kt | 22 +- .../component/styling/GroupHeaderStyling.kt | 17 +- .../styling/HorizontalProgressBarStyling.kt | 2 +- .../ui/component/styling/IconButtonStyling.kt | 28 +- .../ui/component/styling/InputFieldStyling.kt | 8 +- .../ui/component/styling/LazyTreeStyling.kt | 14 +- .../jewel/ui/component/styling/LinkStyling.kt | 17 +- .../jewel/ui/component/styling/MenuStyling.kt | 15 +- .../component/styling/RadioButtonStyling.kt | 11 +- .../ui/component/styling/ScrollbarStyling.kt | 14 +- .../styling/SegmentedControlStyling.kt | 12 +- .../ui/component/styling/SliderStyling.kt | 26 +- .../jewel/ui/component/styling/TabStyling.kt | 32 +- .../ui/component/styling/TextAreaStyling.kt | 13 +- .../ui/component/styling/TextFieldStyling.kt | 13 +- .../ui/component/styling/TooltipStyling.kt | 26 +- .../org/jetbrains/jewel/ui/icon/IconKey.kt | 5 +- .../jetbrains/jewel/ui/icon/NewUiChecker.kt | 5 +- .../jewel/ui/painter/BadgePainter.kt | 24 +- .../jewel/ui/painter/DelegatePainter.kt | 4 +- .../jetbrains/jewel/ui/painter/PainterHint.kt | 90 +- .../jewel/ui/painter/PainterHintsProvider.kt | 19 +- .../jewel/ui/painter/PainterProvider.kt | 19 +- .../ui/painter/PalettePainterHintsProvider.kt | 22 +- .../ui/painter/ResourcePainterProvider.kt | 67 +- .../jewel/ui/painter/badge/BadgeShape.kt | 15 +- .../jewel/ui/painter/badge/DotBadgeShape.kt | 31 +- .../jetbrains/jewel/ui/painter/hints/Badge.kt | 11 +- .../hints/ColorBasedPaletteReplacement.kt | 27 +- .../jewel/ui/painter/hints/DarkAndStroke.kt | 16 +- .../jetbrains/jewel/ui/painter/hints/HiDpi.kt | 13 +- .../hints/KeyBasedPaletteReplacement.kt | 10 +- .../jewel/ui/painter/hints/PathOverride.kt | 9 +- .../jewel/ui/painter/hints/Selected.kt | 8 +- .../jetbrains/jewel/ui/painter/hints/Size.kt | 51 +- .../jewel/ui/painter/hints/Stateful.kt | 39 +- .../jetbrains/jewel/ui/theme/JewelTheme.kt | 111 +- .../jewel/ui/util/ColorExtensions.kt | 14 +- .../jewel/ui/util/ModifierExtensions.kt | 10 +- .../org/jetbrains/jewel/BasicJewelUiTest.kt | 15 +- .../org/jetbrains/jewel/PainterHintTest.kt | 52 +- 274 files changed, 4419 insertions(+), 8464 deletions(-) create mode 100644 .idea/ktfmt.xml create mode 100644 .idea/ktlint-plugin.xml diff --git a/.editorconfig b/.editorconfig index 6086feba12..9d0547802d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,10 +17,25 @@ indent_size = 2 indent_size = 2 [{*.kt,*.kts}] -ktlint_function_signature_body_expression_wrapping = multiline -ktlint_ignore_back_ticked_identifier = true ij_kotlin_allow_trailing_comma = true ktlint_function_naming_ignore_when_annotated_with = Composable +ktlint_function_signature_body_expression_wrapping = multiline +ktlint_ignore_back_ticked_identifier = true +ktlint_standard_annotation = disabled +ktlint_standard_chain-method-continuation = disabled +ktlint_standard_class-signature = disabled +ktlint_standard_condition-wrapping = disabled +ktlint_standard_function-expression-body = disabled +ktlint_standard_function-literal = disabled +ktlint_standard_function-signature = disabled +ktlint_standard_import-ordering = disabled +ktlint_standard_indent = disabled +ktlint_standard_multiline-expression-wrapping = disabled +ktlint_standard_parameter-list-wrapping = disabled +ktlint_standard_string-template-indent = disabled +ktlint_standard_trailing-comma-on-call-site = disabled +ktlint_standard_trailing-comma-on-declaration-site = disabled +ktlint_standard_try-catch-finally-spacing = disabled [gradlew.bat] end_of_line = crlf diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b61f6b2f35..c44c8ffbaa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,8 @@ jobs: - name: Run :check task run: ./gradlew check --continue --no-daemon - - uses: github/codeql-action/upload-sarif@v3 - if: ${{ always() }} - with: - sarif_file: ${{ github.workspace }}/build/reports/static-analysis.sarif - checkout_path: ${{ github.workspace }} +# - uses: github/codeql-action/upload-sarif@v3 +# if: ${{ always() }} +# with: +# sarif_file: ${{ github.workspace }}/build/reports/static-analysis.sarif +# checkout_path: ${{ github.workspace }} diff --git a/.gitignore b/.gitignore index 4d92cbd40e..8a3bfe666e 100644 --- a/.gitignore +++ b/.gitignore @@ -42,7 +42,9 @@ local.properties !.idea/icon.png !.idea/icon_dark.png !.idea/inspectionProfiles/ +!.idea/ktfmt.xml !.idea/ktlint.xml +!.idea/ktlint-plugin.xml !.idea/runConfigurations/ !.idea/scopes/ !.idea/vcs.xml diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml index 981f2f6a25..993d4fb0ec 100644 --- a/.idea/externalDependencies.xml +++ b/.idea/externalDependencies.xml @@ -1,7 +1,11 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 410449b818..65ea4fd049 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -3,6 +3,7 @@