Merge pull request #10929 from Holzhaus/qmlformat-pre-commit-pinned

[RFC] Migrate from `qmlformat` to `qml_formatter`

.github/workflows/pre-commit.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     # The Dockerfile for this container can be found at:
     # https://github.com/Holzhaus/mixxx-ci-docker
-    container: holzhaus/mixxx-ci:20220805
+    container: holzhaus/mixxx-ci:20220930
     steps:
       - name: "Check out repository"
         uses: actions/checkout@v3

.pre-commit-config.yaml

@@ -26,8 +26,10 @@
 
 # _anlz.h/_pdb.h: Header files generated by Kaitai Struct
 exclude: ^(lib/|src/test/.*data/).*|res/translations/.*\.ts|src/.*_(anlz|pdb)\.h$
+minimum_pre_commit_version: 2.21.0
 default_language_version:
   python: python3
+  rust: 1.64.0
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0
@@ -116,6 +118,10 @@ repos:
     hooks:
       - id: prettier
         types: [yaml]
+  - repo: https://github.com/qarmin/qml_formatter.git
+    rev: 0.2.0
+    hooks:
+      - id: qml_formatter
   - repo: local
     hooks:
       - id: qsscheck
@@ -139,13 +145,6 @@ repos:
         language: python
         types: [text]
         files: ^CHANGELOG.md$
-      - id: qmlformat
-        name: qmlformat
-        entry: python tools/qmlformat.py
-        pass_filenames: true
-        language: python
-        types: [text]
-        files: ^.*\.qml$
       - id: qmllint
         name: qmllint
         entry: qmllint

res/qml/AuxiliaryUnit.qml

@@ -38,7 +38,6 @@ Row {
             key: "pregain"
             color: Theme.gainKnobColor
         }
-
     }
 
     Column {
@@ -57,7 +56,6 @@ Row {
             activeColor: Theme.pflActiveButtonColor
             toggleable: true
         }
-
     }
 
     Skin.EmbeddedBackground {
@@ -93,7 +91,6 @@ Row {
                 anchors.centerIn: parent
                 text: "FX1"
             }
-
         }
 
         Skin.InfoBarButton {
@@ -109,9 +106,6 @@ Row {
                 anchors.centerIn: parent
                 text: "FX2"
             }
-
         }
-
     }
-
 }

res/qml/Button.qml

@@ -72,7 +72,6 @@ AbstractButton {
                 target: labelGlow
                 visible: false
             }
-
         }
     ]
 
@@ -90,7 +89,6 @@ AbstractButton {
             right: 10
             bottom: 10
         }
-
     }
 
     contentItem: Item {
@@ -119,7 +117,5 @@ AbstractButton {
             font.pixelSize: Theme.buttonFontPixelSize
             color: root.normalColor
         }
-
     }
-
 }

res/qml/ComboBox.qml

@@ -31,7 +31,6 @@ ComboBox {
             border.color: Theme.deckLineColor
             color: "transparent"
         }
-
     }
 
     contentItem: Text {
@@ -57,12 +56,9 @@ ComboBox {
 
             ScrollIndicator.vertical: ScrollIndicator {
             }
-
         }
 
         background: Skin.EmbeddedBackground {
         }
-
     }
-
 }

res/qml/ControlButton.qml

@@ -22,7 +22,6 @@ Skin.Button {
     onReleased: {
         if (!toggleable)
             control.value = 0;
-
     }
 
     Mixxx.ControlProxy {
@@ -31,5 +30,4 @@ Skin.Button {
         group: root.group
         key: root.key
     }
-
 }

res/qml/ControlKnob.qml

@@ -18,5 +18,4 @@ Skin.Knob {
     TapHandler {
         onDoubleTapped: control.reset()
     }
-
 }

res/qml/ControlMiniKnob.qml

@@ -18,5 +18,4 @@ Skin.MiniKnob {
     TapHandler {
         onDoubleTapped: control.reset()
     }
-
 }

res/qml/ControlSlider.qml

@@ -16,5 +16,4 @@ Skin.Slider {
     TapHandler {
         onDoubleTapped: control.reset()
     }
-
 }

res/qml/CrossfaderRow.qml

@@ -42,7 +42,6 @@ Item {
 
         Skin.MicrophoneDuckingPanel {
         }
-
     }
 
     Skin.SectionBackground {
@@ -68,7 +67,6 @@ Item {
             fg: Theme.imgCrossfaderHandle
             bg: Theme.imgCrossfaderBackground
         }
-
     }
 
     Row {
@@ -100,7 +98,5 @@ Item {
             layoutDirection: Qt.RightToLeft
             unitNumber: 4
         }
-
     }
-
 }

res/qml/Deck.qml

@@ -68,7 +68,6 @@ Item {
         FadeBehavior on visible {
             fadeTarget: rateSlider
         }
-
     }
 
     Rectangle {
@@ -128,7 +127,6 @@ Item {
                     anchors.centerIn: parent
                     text: "FX 1"
                 }
-
             }
 
             Rectangle {
@@ -155,7 +153,6 @@ Item {
                     anchors.centerIn: parent
                     text: "FX 2"
                 }
-
             }
 
             Rectangle {
@@ -214,7 +211,6 @@ Item {
                     group: root.group
                     key: "track_samples"
                 }
-
             }
 
             Item {
@@ -250,7 +246,6 @@ Item {
                     anchors.centerIn: parent
                     source: "images/icon_quantize.svg"
                 }
-
             }
 
             Item {
@@ -286,15 +281,12 @@ Item {
                     anchors.centerIn: parent
                     source: "images/icon_passthrough.svg"
                 }
-
             }
-
         }
 
         FadeBehavior on visible {
             fadeTarget: overview
         }
-
     }
 
     Item {
@@ -351,9 +343,7 @@ Item {
                     width: playButton.height
                     height: playButton.height
                 }
-
             }
-
         }
 
         Skin.SyncButton {
@@ -367,12 +357,10 @@ Item {
         FadeBehavior on visible {
             fadeTarget: buttonBar
         }
-
     }
 
     Mixxx.PlayerDropArea {
         anchors.fill: parent
         group: root.group
     }
-
 }

res/qml/DeckInfoBar.qml

@@ -88,11 +88,8 @@ Rectangle {
                     height: parent.height / 2
                     color: Theme.deckTextColor
                 }
-
             }
-
         }
-
     }
 
     Skin.EmbeddedText {
@@ -181,7 +178,6 @@ Rectangle {
             group: root.group
             key: "bpm"
         }
-
     }
 
     Skin.EmbeddedText {
@@ -202,7 +198,6 @@ Rectangle {
             group: root.group
             key: "rate_ratio"
         }
-
     }
 
     gradient: Gradient {
@@ -223,7 +218,5 @@ Rectangle {
             position: 1
             color: Theme.deckBackgroundColor
         }
-
     }
-
 }

res/qml/DeckRow.qml

@@ -63,7 +63,6 @@ Item {
                 target: rightDeck
                 anchors.left: mixer.right
             }
-
         }
     ]
 
@@ -88,7 +87,6 @@ Item {
         FadeBehavior on visible {
             fadeTarget: mixer
         }
-
     }
 
     Deck {
@@ -116,9 +114,6 @@ Item {
                 property: "implicitHeight"
                 duration: 150
             }
-
         }
-
     }
-
 }

res/qml/DeveloperToolsWindow.qml

@@ -55,7 +55,6 @@ Window {
                         right: 20
                         bottom: 10
                     }
-
                 }
 
                 Text {
@@ -94,9 +93,7 @@ Window {
                 TapHandler {
                     onTapped: controlModel.toggleSortColumn(headerDlgt.column)
                 }
-
             }
-
         }
 
         TableView {
@@ -150,9 +147,7 @@ Window {
                             elide: Text.ElideRight
                             color: Theme.deckTextColor
                         }
-
                     }
-
                 }
 
                 DelegateChoice {
@@ -177,9 +172,7 @@ Window {
                             elide: Text.ElideRight
                             color: Theme.deckTextColor
                         }
-
                     }
-
                 }
 
                 DelegateChoice {
@@ -216,11 +209,8 @@ Window {
 
                             validator: DoubleValidator {
                             }
-
                         }
-
                     }
-
                 }
 
                 DelegateChoice {
@@ -257,17 +247,10 @@ Window {
 
                             validator: DoubleValidator {
                             }
-
                         }
-
                     }
-
                 }
-
             }
-
         }
-
     }
-
 }