Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@ jobs:
name: Build on ${{matrix.os}} for ${{ matrix.label }} ${{ matrix.workspace-loader }} ${{ matrix.use-transparent-compiler }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: ${{ github.event_name == 'pull_request' }}
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/checkout@v4
if: ${{ github.event_name == 'push' }}

# setup .NET per the repo global.json
- name: Setup .NET
Expand Down
34 changes: 27 additions & 7 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
"type": "coreclr",
"request": "launch",
"program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/net8.0/fsautocomplete.dll",
"args": ["--mode", "lsp"],
"args": [
"--mode",
"lsp"
],
"cwd": "${workspaceFolder}",
"console": "internalConsole",
"stopAtEntry": false,
Expand Down Expand Up @@ -47,7 +50,11 @@
}
},
"enableStepFiltering": false,
"args": ["--debug", "--filter", "FSAC.lsp.${input:loader}.${input:compiler}.${input:testName}"],
"args": [
"--debug",
"--filter",
"FSAC.lsp.${input:loader}.${input:compiler}.${input:testName}"
],
"preLaunchTask": "build debug"
},
{
Expand All @@ -69,29 +76,42 @@
}
},
"enableStepFiltering": false,
"args": ["--debug", "--filter", "FSAC.general.${input:testName}"],
"args": [
"--debug",
"--filter",
"FSAC.general.${input:testName}"
],
"preLaunchTask": "build debug"
}
],
"inputs": [
{
"id": "tfm",
"description": "The TFM of the test to run",
"options": ["net8.0", "net9.0"],
"options": [
"net8.0",
"net9.0"
],
"default": "net8.0",
"type": "pickString"
},
{
"id": "loader",
"description": "The loader to use for the test",
"options": ["Ionide WorkspaceLoader", "MSBuild Project Graph WorkspaceLoader"],
"options": [
"Ionide WorkspaceLoader",
"MSBuild Project Graph WorkspaceLoader"
],
"default": "WorkspaceLoader",
"type": "pickString"
},
{
"id": "compiler",
"description": "The compiler to use",
"options": ["BackgroundCompiler", "TransparentCompiler"],
"options": [
"BackgroundCompiler",
"TransparentCompiler"
],
"default": "BackgroundCompiler",
"type": "pickString"
},
Expand All @@ -101,4 +121,4 @@
"type": "promptString"
}
]
}
}
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<WarnOn>$(WarnOn);3390</WarnOn><!-- Malformed XML doc comments -->
<!-- Package Reference with no usable assets -->
<NoWarn>$(NoWarn);NU1701</NoWarn>
<NoWarn>$(NoWarn);NU1510</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ChangelogFile>$(MSBuildThisFileDirectory)CHANGELOG.md</ChangelogFile>
<!-- Only the tool package is packable -->
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"rollForward": "latestMajor",
"allowPrerelease": true
}
}
}
4 changes: 2 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<NoWarn>$(NoWarn);NU5104</NoWarn>
<!-- Yes we know 'times' is for test only, thanks FSC :) -->
<NoWarn>$(NoWarn);FS0075</NoWarn>
<!-- Implicit convertions for string should be fine https://github.com/fsharp/fslang-design/blob/main/FSharp-6.0/FS-1093-additional-conversions.md#motivation-for-op_implicit-type-directed-conversion -->
<NoWarn>$(NoWarn);FS3391</NoWarn>
<!-- Implicit conversions for string should be fine https://github.com/fsharp/fslang-design/blob/main/FSharp-6.0/FS-1093-additional-conversions.md#motivation-for-op_implicit-type-directed-conversion -->
<NoWarn>$(NoWarn);FS3391;NU1510</NoWarn>
<OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:DumpCheckingGraph</OtherFlags>
</PropertyGroup>
</Project>
4 changes: 4 additions & 0 deletions src/FsAutoComplete.Core/Commands.fs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ type NotificationEvent =
| Canceled of errorMessage: string
| FileParsed of string<LocalPath>
| TestDetected of file: string<LocalPath> * tests: TestAdapter.TestAdapterEntry<range>[]
| NestedLanguagesFound of
file: string<LocalPath> *
version: int *
nestedLanguages: NestedLanguages.NestedLanguageDocument array

module Commands =
open System.Collections.Concurrent
Expand Down
2 changes: 2 additions & 0 deletions src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);FS0057</NoWarn> <!-- Allows using experimental FCS APIs -->
<LangVersion>preview</LangVersion>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\FsAutoComplete.Logging\FsAutoComplete.Logging.fsproj" />
Expand Down Expand Up @@ -61,6 +62,7 @@
<Compile Include="SignatureHelp.fs" />
<Compile Include="InlayHints.fs" />
<Compile Include="SymbolLocation.fs" />
<Compile Include="NestedLanguages.fs" />
<Compile Include="Commands.fs" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
Expand Down
Loading
Loading