Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: 9.x
dotnet-version: 10.x
- run: dotnet pack
- run: dotnet nuget push 'ScipDotnet/bin/Release/*.nupkg' --source 'nuget.org' --api-key '${{ secrets.NUGET_APIKEY }}' --skip-duplicate
docker-push:
Expand All @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: 9.x
dotnet-version: 10.x
- uses: docker/setup-buildx-action@v2
- run: echo "PATCH=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
- run: echo "MINOR=${PATCH%.*}" >> $GITHUB_ENV
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
7.x
8.x
9.x
10.x
- run: dotnet format --verify-no-changes
- run: dotnet format --verify-no-changes
working-directory: snapshots/input/syntax
Expand All @@ -36,6 +37,8 @@ jobs:
7.x
8.x
9.x
10.x
- run: dotnet test -p:TargetFrameworks=net10.0
- run: dotnet test -p:TargetFrameworks=net9.0
- run: dotnet test -p:TargetFrameworks=net8.0
- run: dotnet test -p:TargetFrameworks=net7.0
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/ScipDotnet/bin/Debug/net8.0/scip-dotnet.dll",
"program": "${workspaceFolder}/ScipDotnet/bin/Debug/net10.0/scip-dotnet.dll",
"args": ["index", "--working-directory", "${input:path}"],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0@sha256:ae000be75dac94fc40e00f0eee903289e985995cc06dac3937469254ce5b60b6
FROM mcr.microsoft.com/dotnet/sdk:10.0@sha256:3f3cc2daa2358dea8a50d47153c87abc61d301b45606021535fd595cea0d0114
WORKDIR /scip-dotnet
ADD . /scip-dotnet
RUN dotnet pack
ENV PATH="/root/.dotnet/tools:${PATH}"
RUN dotnet tool install --framework net9.0 --add-source ScipDotnet/bin/Release/ --global scip-dotnet
RUN dotnet tool install --framework net10.0 --add-source ScipDotnet/bin/Release/ --global scip-dotnet
RUN dotnet clean
WORKDIR /app
RUN rm -rf /scip-dotnet
2 changes: 1 addition & 1 deletion ScipDotnet.Tests/ScipDotnet.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion ScipDotnet/ScipDotnet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReadmeFile>readme.md</PackageReadmeFile>
<PackageType>DotnetTool</PackageType>
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
<PackAsTool>true</PackAsTool>
<AssemblyName>scip-dotnet</AssemblyName>
<RepositoryUrl>https://github.com/sourcegraph/scip-dotnet</RepositoryUrl>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.0",
"version": "10.0.0",
"rollForward": "latestMajor",
"allowPrerelease": false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion snapshots/input/syntax/Main/Main.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>preview</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion snapshots/input/syntax/VBMain/VBMain.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>VBMain</RootNamespace>
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
218 changes: 218 additions & 0 deletions snapshots/output-net10.0/syntax/Main/Classes.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
using System.Diagnostics.CodeAnalysis;
// ^^^^^^ reference scip-dotnet nuget . . System/
// ^^^^^^^^^^^ reference scip-dotnet nuget . . Diagnostics/
// ^^^^^^^^^^^^ reference scip-dotnet nuget . . CodeAnalysis/

namespace Main;
// ^^^^ reference scip-dotnet nuget . . Main/

[SuppressMessage("ReSharper", "all")]
// ^^^^^^^^^^^^^^^ reference scip-dotnet nuget System.Runtime 10.0.0.0 CodeAnalysis/SuppressMessageAttribute#`.ctor`().
public class Classes
// ^^^^^^^ definition scip-dotnet nuget . . Main/Classes#
// documentation ```cs\nclass Classes\n```
{
public string Name;
// ^^^^ definition scip-dotnet nuget . . Main/Classes#Name.
// documentation ```cs\npublic string Classes.Name\n```
public const int IntConstant = 1;
// ^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#IntConstant.
// documentation ```cs\npublic const int Classes.IntConstant = 1\n```
public const string StringConstant = $"hello";
// ^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#StringConstant.
// documentation ```cs\npublic const string Classes.StringConstant = "hello"\n```

public Classes(int name)
// ^^^^^^^ definition scip-dotnet nuget . . Main/Classes#`.ctor`().
// documentation ```cs\npublic Classes.Classes(int name)\n```
// ^^^^ definition scip-dotnet nuget . . Main/Classes#`.ctor`().(name)
// documentation ```cs\nint name\n```
{
Name = "name";
// ^^^^ reference scip-dotnet nuget . . Main/Classes#Name.
}

public Classes(string name) => Name = name;
// ^^^^^^^ definition scip-dotnet nuget . . Main/Classes#`.ctor`(+1).
// documentation ```cs\npublic Classes.Classes(string name)\n```
// ^^^^ definition scip-dotnet nuget . . Main/Classes#`.ctor`(+1).(name)
// documentation ```cs\nstring name\n```
// ^^^^ reference scip-dotnet nuget . . Main/Classes#Name.
// ^^^^ reference scip-dotnet nuget . . Main/Classes#`.ctor`(+1).(name)

~Classes()
// ^^^^^^^ definition scip-dotnet nuget . . Main/Classes#Finalize().
// documentation ```cs\nprotected Classes.~Classes()\n```
{
Console.WriteLine(42);
// ^^^^^^^ reference scip-dotnet nuget System.Console 10.0.0.0 System/Console#
// ^^^^^^^^^ reference scip-dotnet nuget System.Console 10.0.0.0 System/Console#WriteLine(+7).
}

public class ObjectClass : object, SomeInterface
// ^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#ObjectClass#
// documentation ```cs\nclass ObjectClass\n```
// relationship implementation scip-dotnet nuget . . Main/SomeInterface#
// ^^^^^^^^^^^^^ reference scip-dotnet nuget . . Main/SomeInterface#
{
}

public partial class PartialClass
// ^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#PartialClass#
// documentation ```cs\nclass PartialClass\n```
{
}

class TypeParameterClass<T>
// ^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#TypeParameterClass#
// documentation ```cs\nclass TypeParameterClass<T>\n```
// ^ definition local 0
// documentation ```cs\nT\n```
{
}

internal class InternalMultipleTypeParametersClass<T1, T2>
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#InternalMultipleTypeParametersClass#
// documentation ```cs\nclass InternalMultipleTypeParametersClass<T1, T2>\n```
// ^^ definition local 1
// documentation ```cs\nT1\n```
// ^^ definition local 2
// documentation ```cs\nT2\n```
{
}

interface ICovariantContravariant<in T1, out T2>
// ^^^^^^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#ICovariantContravariant#
// documentation ```cs\ninterface ICovariantContravariant<in T1, out T2>\n```
// ^^ definition local 3
// documentation ```cs\nin T1\n```
// ^^ definition local 4
// documentation ```cs\nout T2\n```
{
public void Method1(T1 t1)
// ^^^^^^^ definition scip-dotnet nuget . . Main/Classes#ICovariantContravariant#Method1().
// documentation ```cs\nvoid ICovariantContravariant<in T1, out T2>.Method1(T1 t1)\n```
// ^^ reference local 3
// ^^ definition scip-dotnet nuget . . Main/Classes#ICovariantContravariant#Method1().(t1)
// documentation ```cs\nT1 t1\n```
{
Console.WriteLine(t1);
// ^^^^^^^ reference scip-dotnet nuget System.Console 10.0.0.0 System/Console#
// ^^^^^^^^^ reference scip-dotnet nuget System.Console 10.0.0.0 System/Console#WriteLine(+9).
// ^^ reference scip-dotnet nuget . . Main/Classes#ICovariantContravariant#Method1().(t1)
}

public T2? Method2()
// ^^ reference local 4
// ^^^^^^^ definition scip-dotnet nuget . . Main/Classes#ICovariantContravariant#Method2().
// documentation ```cs\nT2? ICovariantContravariant<in T1, out T2>.Method2()\n```
{
return default(T2);
// ^^ reference local 4
}
}

public class StructConstraintClass<T> where T : struct
// ^^^^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#StructConstraintClass#
// documentation ```cs\nclass StructConstraintClass<T> where T : struct\n```
// ^ definition local 5
// documentation ```cs\nT\n```
// ^ reference local 5
{
}

public class UnmanagedConstraintClass<T> where T : unmanaged
// ^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#UnmanagedConstraintClass#
// documentation ```cs\nclass UnmanagedConstraintClass<T> where T : unmanaged\n```
// ^ definition local 6
// documentation ```cs\nT\n```
// ^ reference local 6
{
}

public class ClassConstraintClass<T> where T : class
// ^^^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#ClassConstraintClass#
// documentation ```cs\nclass ClassConstraintClass<T> where T : class\n```
// ^ definition local 7
// documentation ```cs\nT\n```
// ^ reference local 7
{
}

public class NonNullableConstraintClass<T> where T : notnull
// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#NonNullableConstraintClass#
// documentation ```cs\nclass NonNullableConstraintClass<T> where T : notnull\n```
// ^ definition local 8
// documentation ```cs\nT\n```
// ^ reference local 8
{
}

public class NewConstraintClass<T> where T : new()
// ^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#NewConstraintClass#
// documentation ```cs\nclass NewConstraintClass<T> where T : new()\n```
// ^ definition local 9
// documentation ```cs\nT\n```
// ^ reference local 9
{
}

public class TypeParameterConstraintClass<T> where T : SomeInterface
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#TypeParameterConstraintClass#
// documentation ```cs\nclass TypeParameterConstraintClass<T> where T : SomeInterface\n```
// ^ definition local 10
// documentation ```cs\nT\n```
// ^ reference local 10
// ^^^^^^^^^^^^^ reference scip-dotnet nuget . . Main/SomeInterface#
{
}

private class MultipleTypeParameterConstraintsClass<T1, T2> where T1 : SomeInterface, SomeInterface2, new()
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#MultipleTypeParameterConstraintsClass#
// documentation ```cs\nclass MultipleTypeParameterConstraintsClass<T1, T2> where T1 : SomeInterface, SomeInterface2, new() where T2 : SomeInterface2\n```
// ^^ definition local 11
// documentation ```cs\nT1\n```
// ^^ definition local 12
// documentation ```cs\nT2\n```
// ^^ reference local 11
// ^^^^^^^^^^^^^ reference scip-dotnet nuget . . Main/SomeInterface#
// ^^^^^^^^^^^^^^ reference scip-dotnet nuget . . Main/SomeInterface2#
where T2 : SomeInterface2
// ^^ reference local 12
// ^^^^^^^^^^^^^^ reference scip-dotnet nuget . . Main/SomeInterface2#
{
}

class IndexClass
// ^^^^^^^^^^ definition scip-dotnet nuget . . Main/Classes#IndexClass#
// documentation ```cs\nclass IndexClass\n```
{
private bool a;
// ^ definition scip-dotnet nuget . . Main/Classes#IndexClass#a.
// documentation ```cs\nprivate bool IndexClass.a\n```

public bool this[int index]
// ^^^^^ definition scip-dotnet nuget . . Main/Classes#IndexClass#`this[]`.(index)
// documentation ```cs\nint index\n```
{
get { return a; }
// ^ reference scip-dotnet nuget . . Main/Classes#IndexClass#a.
set { a = value; }
// ^ reference scip-dotnet nuget . . Main/Classes#IndexClass#a.
// ^^^^^ reference scip-dotnet nuget . . Main/Classes#IndexClass#set_Item().(value)
}
}

}

public interface SomeInterface
// ^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/SomeInterface#
// documentation ```cs\ninterface SomeInterface\n```
{
}

internal interface SomeInterface2
// ^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/SomeInterface2#
// documentation ```cs\ninterface SomeInterface2\n```
{
}
46 changes: 46 additions & 0 deletions snapshots/output-net10.0/syntax/Main/Enums.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
using System.Diagnostics.CodeAnalysis;
// ^^^^^^ reference scip-dotnet nuget . . System/
// ^^^^^^^^^^^ reference scip-dotnet nuget . . Diagnostics/
// ^^^^^^^^^^^^ reference scip-dotnet nuget . . CodeAnalysis/

namespace Main;
// ^^^^ reference scip-dotnet nuget . . Main/

[SuppressMessage("ReSharper", "all")]
// ^^^^^^^^^^^^^^^ reference scip-dotnet nuget System.Runtime 10.0.0.0 CodeAnalysis/SuppressMessageAttribute#`.ctor`().
public class Enums
// ^^^^^ definition scip-dotnet nuget . . Main/Enums#
// documentation ```cs\nclass Enums\n```
{
enum EnumWithIntValues
// ^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Enums#EnumWithIntValues#
// documentation ```cs\nenum EnumWithIntValues\n```
// relationship implementation scip-dotnet nuget System.Runtime 10.0.0.0 System/IComparable#
// relationship implementation scip-dotnet nuget System.Runtime 10.0.0.0 System/IConvertible#
// relationship implementation scip-dotnet nuget System.Runtime 10.0.0.0 System/ISpanFormattable#
// relationship implementation scip-dotnet nuget System.Runtime 10.0.0.0 System/IFormattable#
{
Ten = 10,
// ^^^ definition scip-dotnet nuget . . Main/Enums#EnumWithIntValues#Ten.
// documentation ```cs\nEnumWithIntValues.Ten = 10\n```
Twenty = 20
// ^^^^^^ definition scip-dotnet nuget . . Main/Enums#EnumWithIntValues#Twenty.
// documentation ```cs\nEnumWithIntValues.Twenty = 20\n```
}

enum EnumWithByteValues
// ^^^^^^^^^^^^^^^^^^ definition scip-dotnet nuget . . Main/Enums#EnumWithByteValues#
// documentation ```cs\nenum EnumWithByteValues\n```
// relationship implementation scip-dotnet nuget System.Runtime 10.0.0.0 System/IComparable#
// relationship implementation scip-dotnet nuget System.Runtime 10.0.0.0 System/IConvertible#
// relationship implementation scip-dotnet nuget System.Runtime 10.0.0.0 System/ISpanFormattable#
// relationship implementation scip-dotnet nuget System.Runtime 10.0.0.0 System/IFormattable#
{
Five = 0x05,
// ^^^^ definition scip-dotnet nuget . . Main/Enums#EnumWithByteValues#Five.
// documentation ```cs\nEnumWithByteValues.Five = 5\n```
Fifteen = 0x0F
// ^^^^^^^ definition scip-dotnet nuget . . Main/Enums#EnumWithByteValues#Fifteen.
// documentation ```cs\nEnumWithByteValues.Fifteen = 15\n```
}
}
Loading
Loading