Merge pull request #27 from gp-pereira/split-packages

Split packages

Author: gp-pereira

.formatter.exs

@@ -1,4 +1,4 @@
 # Used by "mix format"
 [
-  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
+  inputs: ["{mix,.formatter}.exs", "{refactorex,refactorex_lsp}/**/*.{ex,exs}"]
 ]

.github/workflows/vscode_publish.yml

@@ -13,19 +13,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      # - name: Setup elixir
-      #   uses: erlef/setup-elixir@v1
-      #   with:
-      #     elixir-version: 1.13.4
-      #     otp-version: 24.3.4
-
-      # - name: Install elixir deps
-      #   run: mix deps.get
-
       - name: Move necessary files
         run: |
           mkdir extensions/vscode/refactorex
-          cp -r lib mix.exs mix.lock extensions/vscode/refactorex
+          cp -r refactorex/lib refactorex/mix.exs refactorex/mix.lock extensions/vscode/refactorex
+          mkdir extensions/vscode/refactorex_lsp
+          cp -r refactorex_lsp/lib refactorex_lsp/mix.exs refactorex_lsp/mix.lock extensions/vscode/refactorex_lsp
           cp README.md LICENSE.md extensions/vscode
 
       - name: Install node deps

.gitignore

@@ -1,31 +1,14 @@
-# The directory Mix will write compiled artifacts to.
-/_build/
+_build
+cover
+deps
+doc
+tmp
 
-# If you run "mix test --cover", coverage assets end up here.
-/cover/
-
-# The directory Mix downloads your dependencies sources to.
-/deps/
-
-# Where third-party dependencies like ExDoc output generated docs.
-/doc/
-
-# Ignore .fetch files in case you like to edit your project deps locally.
-/.fetch
-
-# If the VM crashes, it generates a dump, let's ignore it too.
 erl_crash.dump
-
-# Also ignore archive artifacts (built via "mix archive.build").
 *.ez
 
-# Ignore package tarball (built via "mix hex.build").
-refactorex-*.tar
-
-# Temporary files, for example, from tests.
-/tmp/
-
 /extensions/vscode/node_modules/
 /extensions/vscode/out/
 /extensions/vscode/refactorex/
+/extensions/vscode/refactorex_lsp/
 /extensions/vscode/**/*.vsix

bin/start

@@ -2,6 +2,6 @@
 
 # used for local development
 
-cd "$(dirname "$0")"/.. || exit 1
+cd "$(dirname "$0")"/../refactorex_lsp || exit 1
 
-elixir --sname undefined -S mix run --no-halt -e "Application.ensure_all_started(:refactorex)" -- "$@"
+elixir --sname undefined -S mix run --no-halt -e "Application.ensure_all_started(:refactorex_lsp)" -- "$@"

extensions/vscode/src/extension.ts

@@ -13,7 +13,7 @@ let client: LanguageClient;
 let server: ChildProcess;
 
 export async function activate(context: ExtensionContext) {
-	const serverPath = context.asAbsolutePath("refactorex");
+	const serverPath = context.asAbsolutePath("refactorex_lsp");
 
 	client = new LanguageClient(
 		"refactorex",
@@ -93,7 +93,7 @@ function startServer(serverPath: string, port: number): ChildProcess {
 			`cd ${serverPath} &&`,
 			`elixir --sname undefined -S`,
 			`mix run --no-halt -e`,
-			`"Application.ensure_all_started(:refactorex)"`,
+			`"Application.ensure_all_started(:refactorex_lsp)"`,
 			`-- --port ${port}`,
 		].join(" "),
 		(error, stdout, stderr) => {

getting_started.md

@@ -1,32 +1,26 @@
-defmodule Refactorex.MixProject do
+defmodule RefactorexWorkspace.MixProject do
   use Mix.Project
 
   def project do
     [
-      app: :refactorex,
+      app: :refactorex_workspace,
       version: "0.1.0",
       elixir: "~> 1.13",
-      start_permanent: Mix.env() == :prod,
-      elixirc_paths: elixirc_paths(Mix.env()),
-      deps: deps()
+      deps: deps(),
+      aliases: aliases()
     ]
   end
 
-  def application do
-    [
-      extra_applications: [:logger],
-      mod: {Refactorex.Application, []}
-    ]
-  end
+  def application, do: [extra_applications: []]
 
-  defp elixirc_paths(:test), do: ["lib", "test/support"]
-  defp elixirc_paths(_), do: ["lib"]
+  defp deps, do: [{:credo, "~> 1.7", only: [:dev, :test], runtime: false}]
 
-  defp deps do
+  defp aliases do
     [
-      {:gen_lsp, "~> 0.3.0"},
-      {:sourceror, "~> 1.7"},
-      {:credo, "~> 1.7.0", only: [:test, :dev], runtime: false}
+      "test.all": ["cmd --cd refactorex mix test", "cmd --cd refactorex_lsp mix test"],
+      "deps.all": ["cmd --cd refactorex mix deps.get", "cmd --cd refactorex_lsp mix deps.get"],
+      "credo.all": ["credo --config-file .credo.exs"],
+      "check.all": ["format.all --check-formatted", "credo.all --strict", "test.all"]
     ]
   end
 end

mix.exs

@@ -1,13 +1,6 @@
 %{
-  "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
-  "credo": {:hex, :credo, "1.7.5", "643213503b1c766ec0496d828c90c424471ea54da77c8a168c725686377b9545", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "f799e9b5cd1891577d8c773d245668aa74a2fcd15eb277f51a0131690ebfb3fd"},
-  "diffie": {:hex, :diffie, "0.2.0", "7a828780de5b9ad4aa2cbda235a00fb697856f2ccd5effaa470b975175b94c90", [:mix], [], "hexpm", "5147cddea7ec6696f83884490024acc506594ad506873cac432d837189f65d1b"},
-  "file_system": {:hex, :file_system, "1.0.0", "b689cc7dcee665f774de94b5a832e578bd7963c8e637ef940cd44327db7de2cd", [:mix], [], "hexpm", "6752092d66aec5a10e662aefeed8ddb9531d79db0bc145bb8c40325ca1d8536d"},
-  "gen_lsp": {:hex, :gen_lsp, "0.3.0", "cafe190b7c8f44b25e20afcf2649062aeb708e56576cbf60639014a69d55a6c3", [:mix], [{:jason, "~> 1.3", [hex: :jason, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.5 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:schematic, "~> 0.2", [hex: :schematic, repo: "hexpm", optional: false]}, {:typed_struct, "~> 0.3.0", [hex: :typed_struct, repo: "hexpm", optional: false]}], "hexpm", "a087efd4725fab2b41ff1f4557ba62a8cda3d226e671e6d40ff8dc034420a425"},
-  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
-  "nimble_options": {:hex, :nimble_options, "1.1.0", "3b31a57ede9cb1502071fade751ab0c7b8dbe75a9a4c2b5bbb0943a690b63172", [:mix], [], "hexpm", "8bbbb3941af3ca9acc7835f5655ea062111c9c27bcac53e004460dfd19008a99"},
-  "schematic": {:hex, :schematic, "0.3.1", "be633c1472959dc0ace22dd0e1f1445b099991fec39f6d6e5273d35ebd217ac4", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "52c419b5c405286e2d0369b9ca472b00b850c59a8b0bdf0dd69172ad4418d5ea"},
-  "sourceror": {:hex, :sourceror, "1.7.1", "599d78f4cc2be7d55c9c4fd0a8d772fd0478e3a50e726697c20d13d02aa056d4", [:mix], [], "hexpm", "cd6f268fe29fa00afbc535e215158680a0662b357dc784646d7dff28ac65a0fc"},
-  "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
-  "typed_struct": {:hex, :typed_struct, "0.3.0", "939789e3c1dca39d7170c87f729127469d1315dcf99fee8e152bb774b17e7ff7", [:mix], [], "hexpm", "c50bd5c3a61fe4e198a8504f939be3d3c85903b382bde4865579bc23111d1b6d"},
+  bunt: {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
+  credo: {:hex, :credo, "1.7.12", "9e3c20463de4b5f3f23721527fcaf16722ec815e70ff6c60b86412c695d426c1", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8493d45c656c5427d9c729235b99d498bd133421f3e0a683e5c1b561471291e5"},
+  file_system: {:hex, :file_system, "1.1.0", "08d232062284546c6c34426997dd7ef6ec9f8bbd090eb91780283c9016840e8f", [:mix], [], "hexpm", "bfcf81244f416871f2a2e15c1b515287faa5db9c6bcf290222206d120b3d43f6"},
+  jason: {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
 }

mix.lock

@@ -0,0 +1,14 @@
+defmodule Refactorex.Application do
+  use Application
+
+  def start(_, _) do
+    Supervisor.start_link(
+      [
+        {Refactorex.NameCache, []},
+        {Task.Supervisor, [name: Refactorex.Refactor]}
+      ],
+      strategy: :one_for_one,
+      name: Refactorex.Supervisor
+    )
+  end
+end