Merge pull request #336 from axelson/formatting

Update formatting for Elixir 1.15
ScenicFramework · Dec 16, 2023 · 39e4279 · 39e4279
2 parents d3f1e6b + 8a8c2fa
commit 39e4279
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,6 +49,9 @@ jobs:
       run: mix deps.compile
     - name: Compile
       run: mix compile --warnings-as-errors
+    - name: Check formatting
+      run: mix format --check-formatted
+      if: startsWith(matrix.elixir, '1.15')
     - name: Run Tests
       run: mix test
     - name: Run credo

diff --git a/lib/scenic/assets/static.ex b/lib/scenic/assets/static.ex
@@ -583,7 +583,10 @@ defmodule Scenic.Assets.Static do
         assign(lib, :aliases, new_alias, hash)
 
       _ ->
-        Logger.warning("Attempted to alias #{inspect(new_alias)} to unknown asset: #{inspect(to)}")
+        Logger.warning(
+          "Attempted to alias #{inspect(new_alias)} to unknown asset: #{inspect(to)}"
+        )
+
         lib
     end
   end

diff --git a/lib/scenic/assets/stream/bitmap.ex b/lib/scenic/assets/stream/bitmap.ex
@@ -78,7 +78,7 @@ defmodule Scenic.Assets.Stream.Bitmap do
     :ok =
       @app
       |> :code.priv_dir()
-      |> :filename.join('bitmap')
+      |> :filename.join(~c"bitmap")
       |> :erlang.load_nif(0)
   end
 

diff --git a/lib/scenic/component/input/checkbox.ex b/lib/scenic/component/input/checkbox.ex
@@ -102,7 +102,7 @@ defmodule Scenic.Component.Input.Checkbox do
     {:ok, {Static.Font, fm}} = Static.meta(@default_font)
     ascent = FontMetrics.ascent(@default_font_size, fm)
     fm_width = FontMetrics.width(text, @default_font_size, fm)
-    space_width = FontMetrics.width(' ', @default_font_size, fm)
+    space_width = FontMetrics.width(~c" ", @default_font_size, fm)
     # box_width = fm_width + ascent + space_width * 2 + @border_width
 
     box_height = ascent
@@ -174,7 +174,7 @@ defmodule Scenic.Component.Input.Checkbox do
     ascent = FontMetrics.ascent(@default_font_size, fm)
     descent = FontMetrics.descent(@default_font_size, fm)
     fm_width = FontMetrics.width(text, @default_font_size, fm)
-    space_width = FontMetrics.width(' ', @default_font_size, fm)
+    space_width = FontMetrics.width(~c" ", @default_font_size, fm)
     box_width = fm_width + ascent + space_width + @border_width
     {0, 0, box_width, ascent - descent}
   end

diff --git a/lib/scenic/component/input/radio_button.ex b/lib/scenic/component/input/radio_button.ex
@@ -77,7 +77,7 @@ defmodule Scenic.Component.Input.RadioButton do
     {:ok, {Static.Font, fm}} = Static.meta(@default_font)
     ascent = FontMetrics.ascent(@default_font_size, fm)
     fm_width = FontMetrics.width(text, @default_font_size, fm)
-    space_width = FontMetrics.width(' ', @default_font_size, fm)
+    space_width = FontMetrics.width(~c" ", @default_font_size, fm)
     outer_radius = ascent * 0.5
     inner_radius = ascent * 0.3125
 
@@ -140,7 +140,7 @@ defmodule Scenic.Component.Input.RadioButton do
     ascent = FontMetrics.ascent(@default_font_size, fm)
     descent = FontMetrics.descent(@default_font_size, fm)
     fm_width = FontMetrics.width(text, @default_font_size, fm)
-    space_width = FontMetrics.width(' ', @default_font_size, fm)
+    space_width = FontMetrics.width(~c" ", @default_font_size, fm)
     box_width = fm_width + ascent + space_width + @border_width
     {0, 0, box_width, ascent - descent}
   end

diff --git a/lib/scenic/component/input/radio_group.ex b/lib/scenic/component/input/radio_group.ex
@@ -224,7 +224,7 @@ defmodule Scenic.Component.Input.RadioGroup do
         end
       end)
 
-    space_width = FontMetrics.width(' ', @default_font_size, fm)
+    space_width = FontMetrics.width(~c" ", @default_font_size, fm)
     box_width = fm_width + ascent + space_width + @border_width
     {0, 0, box_width, @line_height * Enum.count(items)}
   end

diff --git a/lib/scenic/component/input/text_field.ex b/lib/scenic/component/input/text_field.ex
@@ -110,7 +110,7 @@ defmodule Scenic.Component.Input.TextField do
 
   @input_capture [:cursor_button, :codepoint, :key]
 
-  @password_char '*'
+  @password_char ~c"*"
 
   # --------------------------------------------------------
   @impl Scenic.Component

diff --git a/lib/scenic/math/line.ex b/lib/scenic/math/line.ex
@@ -28,7 +28,7 @@ defmodule Scenic.Math.Line do
     :ok =
       @app
       |> :code.priv_dir()
-      |> :filename.join('line')
+      |> :filename.join(~c"line")
       |> :erlang.load_nif(0)
   end
 

diff --git a/lib/scenic/math/matrix.ex b/lib/scenic/math/matrix.ex
@@ -34,7 +34,7 @@ defmodule Scenic.Math.Matrix do
     :ok =
       @app
       |> :code.priv_dir()
-      |> :filename.join('matrix')
+      |> :filename.join(~c"matrix")
       |> :erlang.load_nif(0)
   end
 

diff --git a/test/scenic/scene_test.exs b/test/scenic/scene_test.exs
@@ -398,7 +398,8 @@ defmodule Scenic.SceneTest do
 
     :ok = Scene.request_input(scene, :cursor_pos)
 
-    assert Scene.fetch_requests(scene) ~> {:ok, sorted_list([:cursor_pos, :cursor_button, :codepoint])}
+    assert Scene.fetch_requests(scene)
+           ~> {:ok, sorted_list([:cursor_pos, :cursor_button, :codepoint])}
   end
 
   test "unrequest_input works", %{scene: scene} do