Js

.gitattributes

@@ -0,0 +1,3 @@
+*.ml linguist-language=OCaml
+*.mli linguist-language=OCaml
+*.t -linguist-detectable

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: OCaml Community Forum
+    url: https://discuss.ocaml.org/
+    about: Please ask and answer questions here.
+  - name: OCaml Community Discord
+    url: https://discord.gg/cCYQbqN
+    about: Please ask and answer questions here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: 'Feature request: ...'
-labels: Kind/Feature-request
+labels: 'Kind/feature-request'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,14 @@
+---
+name: Question
+about: Do you have a question about ocamlformat?
+title: 'Question: ...'
+labels: 'Kind/question'
+assignees: ''
+
+---
+
+Please give as much context as possible.
+
+Is your question related to a specific OCaml version?
+Is your question related to a specific OCamlFormat version?
+Is your question related to a specific formatting profile or option?

.github/ISSUE_TEMPLATE/style_suggestion.md

@@ -0,0 +1,18 @@
+---
+name: Style suggestion
+about: Suggest a different formatting style for this project
+title: 'Style suggestion: ...'
+labels: 'Kind/style-suggestion'
+assignees: ''
+
+---
+
+**Current formatting**
+Please copy-paste your code and the formatting that is currently applied to it.
+
+**Describe the formatting you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context about the style request here.
+What justifies ocamlformat adding this new style?

.github/workflows/build-linux.yml

@@ -0,0 +1,116 @@
+name: Build on Linux
+
+# Build and run tests on ubuntu-latest.
+# The built binary is uploaded for later use in test-branch.
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-linux:
+    strategy:
+      matrix:
+        ocaml-compiler:
+          # Don't include every versions. OCaml-CI already covers that
+          - 4.14.x
+
+    runs-on: ubuntu-latest
+
+    steps:
+      # Clone the project
+      - uses: actions/checkout@v2
+        with:
+          # Don't checkout the implicit merge commit to avoid wrong substitution
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      # Setup
+      - name: Setup OCaml ${{ matrix.ocaml-version }}
+        uses: ocaml/setup-ocaml@v3
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+
+      - name: Opam dependencies
+        run: opam install --deps-only -t .
+
+      - name: Format
+        run: opam exec -- dune fmt
+
+      - name: Build
+        run: |
+          opam exec -- dune subst
+          opam exec -- dune build -p ocamlformat-lib,ocamlformat
+
+      - name: Runtest
+        run: opam exec -- dune runtest
+
+      - name: Check manpages
+        run: opam exec -- dune build @gen_manpage --auto-promote
+
+      - name: Upload binary
+        # Using a specific version because of https://github.com/actions/upload-artifact/issues/590
+        uses: actions/[email protected]
+        with:
+          name: ocamlformat-${{ runner.os }}-${{ runner.arch }}
+          path: _build/install/default/bin/ocamlformat
+
+  test-branch:
+    if: ${{ github.ref != 'refs/heads/main' }}
+    needs: build-linux
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        profile:
+          - conventional
+          - ocamlformat
+          - janestreet
+        # To enable comparing with ocp-indent:
+        # include:
+        #   - ocp_indent: true
+        #     ocp_indent_config: JaneStreet
+        #     profile: janestreet
+
+    steps:
+      - name: Install ocp-indent
+        if: ${{ matrix.ocp_indent }}
+        run: |
+          sudo apt install -y ocp-indent
+          sudo touch /etc/ocamlfind.conf
+
+      # Clone the project
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: actions/cache@v3
+        with:
+          path: test-extra/code
+          key: test-extra-code
+
+      - name: Fetch main build of ocamlformat
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: build-linux.yml
+          workflow_conclusion: ""
+          check_artifacts: true
+          branch: main
+          name: ocamlformat-${{ runner.os }}-${{ runner.arch }}
+          path: ocamlformat-a
+
+      - name: Fetch new build of ocamlformat
+        uses: actions/[email protected]
+        with:
+          name: ocamlformat-${{ runner.os }}-${{ runner.arch }}
+          path: ocamlformat-b
+
+      - name: Test ${{ matrix.profile }} profile
+        run: |
+          chmod +x ocamlformat-a/ocamlformat ocamlformat-b/ocamlformat
+          ./tools/test_branch.sh $TEST_BRANCH_ARGS -n -a ocamlformat-a/ocamlformat -b ocamlformat-b/ocamlformat 'profile=${{ matrix.profile }}'
+        shell: bash
+        env:
+          OCP_INDENT_CONFIG: ${{ matrix.ocp_indent_config }}
+          TEST_BRANCH_ARGS: ${{ matrix.ocp_indent && '-o -s' || '' }}

.github/workflows/build-mingw64.yml

@@ -1,43 +1,78 @@
 name: Build mingw64 binary
 
 on:
+  release:
+    types: [released]
   workflow_dispatch:
     inputs:
       ref:
         required: true
-        default: 'master'
-
-env:
-  CYGWINSETUP: setup-x86_64.exe
-  PACKAGES: git,m4,patchutils,make,curl,unzip,mingw64-x86_64-binutils,mingw64-x86_64-gcc-core,mingw64-x86_64-headers,mingw64-x86_64-runtime
-  SITE: https://mirrors.kernel.org/sourceware/cygwin
+        default: 'main'
 
 jobs:
   build:
     runs-on: windows-latest
-    env:
-      SHELLOPTS: igncr
     steps:
+      - name: Set ref for release builds
+        if: github.event_name == 'release'
+        run: |
+          "build_ref=${{ github.ref }}" >> $env:GITHUB_ENV
+
+      - name: Set ref for manual builds
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          "build_ref=${{ github.event.inputs.ref }}" >> $env:GITHUB_ENV
+
+      - name: Set artifact name
+        shell: bash
+        run: |
+          echo "artifact_name=ocamlformat-${build_ref##*/}.exe" >> $GITHUB_ENV
+
+      - name: Disable Git EOL Conversion
+        run: |
+          git config --global core.autocrlf false
+
       - name: Checkout Repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ env.build_ref }}
+
+      - uses: ocaml/setup-ocaml@v3
         with:
-          ref: ${{ github.event.inputs.ref }}
-      - name: Download Cygwin Installer
+          ocaml-compiler: 4.14.x
+
+      - name: Install dependencies
         run: |
-          curl.exe -o C:\${{ env.CYGWINSETUP }} https://www.cygwin.com/${{ env.CYGWINSETUP }}
-        shell: cmd
-      - name: Setup Cygwin
+          opam pin add -yn ocamlformat-lib.dev .
+          opam pin add -yn ocamlformat.dev .
+          opam install -y --deps-only ocamlformat
+
+      - name: Build
         run: |
-          C:\${{ env.CYGWINSETUP }} -A -q -D -L -g -o -s ${{ env.SITE }} -l C:\cygwin64-cache -R C:\cygwin64 -C Base -P ${{ env.PACKAGES }}
-        shell: cmd
-      - name: Run Build Script
+          opam exec -- dune subst
+          opam exec -- dune build -p ocamlformat-lib,ocamlformat @install
+          opam exec -- dune install --prefix=install ocamlformat
+          Copy-Item ${{ github.workspace }}\\install\\bin\\ocamlformat.exe -Destination .\${{ env.artifact_name }}
+
+      - name: Version check
         run: |
-          cd '${{ github.workspace }}'
-          bash tools/build-mingw64.sh
-        shell: C:\cygwin64\bin\bash.exe --login --norc '{0}'
+          echo "Version check:"
+          install/bin/ocamlformat.exe --version
+
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: ocamlformat-${{ github.event.inputs.ref }}.exe
-          path: ${{ github.workspace }}\_build\install\default\bin\ocamlformat.exe
+          name: ${{ env.artifact_name }}
+          path: ${{ env.artifact_name }}
           if-no-files-found: error
+
+      - name: Upload Release Asset
+        if: github.event_name == 'release'
+        run: >
+          curl.exe
+          --data-binary '@${{ env.artifact_name }}'
+          -X POST
+          -H "Content-Type: application/octet-stream"
+          -H "Accept: application/vnd.github+json"
+          -H "Authorization: Bearer ${{ github.token }}"
+          "https://uploads.github.com/repos/${{ github.repository }}/releases/${{ github.event.release.id }}/assets?name=${{ env.artifact_name }}"

.github/workflows/build-others.yml

@@ -0,0 +1,44 @@
+name: Build on other platforms
+
+# Build and run tests on platforms others than Linux, doing less tests and
+# running asynchronously from other jobs.
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-others:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - windows-latest
+        ocaml-compiler:
+          # Don't include every versions. OCaml-CI already covers that
+          - 4.14.x
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      # Clone the project
+      - uses: actions/checkout@v2
+
+      # Setup
+      - name: Setup OCaml ${{ matrix.ocaml-version }}
+        uses: ocaml/setup-ocaml@v3
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+
+      - name: Opam dependencies
+        run: opam install --deps-only -t .
+
+      - name: Format
+        run: opam exec -- dune fmt
+
+      - name: Runtest
+        run: opam exec -- dune runtest

.github/workflows/changelog-check.yml

@@ -0,0 +1,13 @@
+name: Changelog check
+
+on:
+  pull_request:
+    branches: [ main ]
+    types: [ opened, synchronize, reopened, labeled, unlabeled ]
+
+jobs:
+  Changelog-Entry-Check:
+    name: Check Changelog Action
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: tarides/changelog-check-action@v1

.github/workflows/pr-number.yml

@@ -0,0 +1,10 @@
+name: PR number update
+
+on: [pull_request_target]
+
+jobs:
+  PR-Number-Update:
+    name: Update PR number
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: tarides/[email protected]

.ocamlformat

@@ -1,6 +1,9 @@
 profile = ocamlformat
 break-cases = fit
 margin = 77
-parse-docstrings = true
 wrap-comments = true
 line-endings = lf
+
+# To make ocaml-ci happy
+version = ignore
+version-check = false

.ocamlformat-ignore

@@ -1,3 +1 @@
-vendor/*/*
-vendor/*/*/*
-vendor/*/*/*/*
+vendor/**

.vscode/launch.json

@@ -0,0 +1,13 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "OCaml earlybird (experimental)",
+            "type": "ocaml.earlybird",
+            "request": "launch",
+            "program": "${workspaceRoot}/_build/default/bin/ocamlformat/main.bc",
+            "arguments": ["-g", "${workspaceRoot}/test.ml"],
+            "stopOnEntry": true
+        }
+    ]
+}