From dbe81dabd57b5d501f958c7de0d79d172e4ab82f Mon Sep 17 00:00:00 2001
From: Simon Christ <SimonChrist@gmx.de>
Date: Fri, 25 Mar 2022 17:39:54 +0100
Subject: [PATCH] fix #4151 (#4153)

* letter and Set the consts

* use julia-code-style-suggesters

* remove superfluous name

* edit by copy of code-style-suggesters

* delete stuff

* remove using

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/workflows/format_check.yml | 67 +++++++++++++++++++-----------
 src/consts.jl                      | 26 ++++++------
 test/test_args.jl                  |  8 ++++
 3 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/format_check.yml b/.github/workflows/format_check.yml
index fa627674..7948f036 100644
--- a/.github/workflows/format_check.yml
+++ b/.github/workflows/format_check.yml
@@ -1,37 +1,54 @@
 name: format
 
 on:
+  pull_request:
   push:
     branches:
       - 'master'
-    tags: '*'
-  pull_request:
 
 jobs:
-  check:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        julia-version: ['1']
-        julia-arch: [x64]
-        os: [ubuntu-latest]
+  code-style:
+    runs-on: ubuntu-latest
     steps:
-      - uses: julia-actions/setup-julia@latest
-        with:
-          version: ${{ matrix.julia-version }}
-
       - uses: actions/checkout@v2
-      - name: Install JuliaFormatter and format
+      - uses: julia-actions/setup-julia@v1
+      - name: Install dependencies
         run: |
-          julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))'
-          julia -e 'using JuliaFormatter; format(["src", "test"], verbose=true)'
-      - name: Format check
+          using Pkg
+          Pkg.add([
+              PackageSpec("JuliaFormatter"),
+              PackageSpec(url = "https://github.com/tkf/JuliaProjectFormatter.jl.git"),
+          ])
+        shell: julia --color=yes {0}
+
+      - name: Format Julia files
         run: |
-          julia -e '
-          out = Cmd(`git diff --name-only`) |> read |> String
-          if out == ""
-              exit(0)
-          else
-              @error "These files have not been formatted:\n$out"
-              exit(1)
-          end'
+          using JuliaFormatter
+          format(["src", "test"])
+        shell: julia --color=yes --compile=min -O0 {0}
+      - name: suggester / JuliaFormatter
+        uses: reviewdog/action-suggester@v1
+        with:
+          tool_name: JuliaFormatter
+          fail_on_error: true
+
+      # reviewdog/action-suggester not using `cleanup` flag?
+      - name: Cleanup
+        if: success() || failure()
+        run: |
+          git checkout -- .
+          git clean --force
+        shell: bash
+
+      - name: Format Julia project files
+        if: success() || failure()
+        run: |
+          using JuliaProjectFormatter
+          format_projects()
+        shell: julia --color=yes --compile=min -O0 {0}
+      - name: suggester / JuliaProjectFormatter
+        if: success() || failure()
+        uses: reviewdog/action-suggester@v1
+        with:
+          tool_name: JuliaProjectFormatter
+          fail_on_error: true
diff --git a/src/consts.jl b/src/consts.jl
index a4072229..3f2a8653 100644
--- a/src/consts.jl
+++ b/src/consts.jl
@@ -41,29 +41,27 @@ const _initial_fontsizes =
 const _internal_args =
     [:plot_object, :series_plotindex, :markershape_to_add, :letter, :idxfilter]
 
-const _axis_args = sort(union(collect(keys(_axis_defaults))))
-const _series_args = sort(union(collect(keys(_series_defaults))))
-const _subplot_args = sort(union(collect(keys(_subplot_defaults))))
-const _plot_args = sort(union(collect(keys(_plot_defaults))))
+const _axis_args = Set(keys(_axis_defaults))
+const _series_args = Set(keys(_series_defaults))
+const _subplot_args = Set(keys(_subplot_defaults))
+const _plot_args = Set(keys(_plot_defaults))
 
 const _magic_axis_args = [:axis, :tickfont, :guidefont, :grid, :minorgrid]
 const _magic_subplot_args =
     [:title_font, :legend_font, :legend_title_font, :plot_title_font, :colorbar_titlefont]
 const _magic_series_args = [:line, :marker, :fill]
 const _all_magic_args =
-    sort(union(_magic_axis_args, _magic_series_args, _magic_subplot_args))
+    Set(union(_magic_axis_args, _magic_series_args, _magic_subplot_args))
 
-const _all_axis_args = sort(union([_axis_args; _magic_axis_args]))
-const _all_subplot_args = sort(union([_subplot_args; _magic_subplot_args]))
-const _all_series_args = sort(union([_series_args; _magic_series_args]))
+const _all_axis_args = union(_axis_args, _magic_axis_args)
+const _lettered_all_axis_args =
+    Set([Symbol(letter, kw) for letter in (:x, :y, :z) for kw in _all_axis_args])
+const _all_subplot_args = union(_subplot_args, _magic_subplot_args)
+const _all_series_args = union(_series_args, _magic_series_args)
 const _all_plot_args = _plot_args
 
-const _all_args = sort(union([
-    _all_axis_args
-    _all_subplot_args
-    _all_series_args
-    _all_plot_args
-]))
+const _all_args =
+    union(_lettered_all_axis_args, _all_subplot_args, _all_series_args, _all_plot_args)
 
 # add all pluralized forms to the _keyAliases dict
 for arg in _all_args
diff --git a/test/test_args.jl b/test/test_args.jl
index 49cab920..f49c0e21 100644
--- a/test/test_args.jl
+++ b/test/test_args.jl
@@ -8,3 +8,11 @@ using Plots, Test
     @test hline!(deepcopy(pl), [1.75], z_order = :back)[1].series_list[1][:label] == "y3"
     @test hline!(deepcopy(pl), [1.75], z_order = 2)[1].series_list[2][:label] == "y3"
 end
+
+@testset "Axis Attributes" begin
+    pl = @test_nowarn plot(; tickfont = font(10, "Times"))
+    for axis in (:xaxis, :yaxis, :zaxis)
+        @test pl[1][axis][:tickfontsize] == 10
+        @test pl[1][axis][:tickfontfamily] == "Times"
+    end
+end