Merge branch 'main' into ci/windows

Author: gnikit

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto
+* eol=lf

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/main.yaml

@@ -16,7 +16,7 @@ jobs:
       GCC_V: ${{ matrix.gcc_v }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:

.github/workflows/nightly.yml

@@ -9,7 +9,7 @@ jobs:
   nightly:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 18

.github/workflows/publish.yml

@@ -7,7 +7,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 18

CHANGELOG.md

@@ -80,6 +80,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Fixed bug where specifying `-ffree-line-length-X` and `-ffixed-line-length-X`
+  as `linter.extraArgs` would be overridden by the default behaviour of `fortls`
+  ([#925](https://github.com/fortran-lang/vscode-fortran-support/issues/925))
 - Fixed bug where linter would not use the correct Fortran file association
   if the extension was part of the default extensions of another Fortran lang ID
   ([#904](https://github.com/fortran-lang/vscode-fortran-support/issues/904))