Skip to content

Add EnclosingEntity and IsAbstract to Declaration contract #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rneatherway merged 9 commits into from
Oct 14, 2016
Merged

Add EnclosingEntity and IsAbstract to Declaration contract #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
739de46
add EnclosingEntity and IsAbstract to Declaration contract
Oct 13, 2016
b0300ce
update FCS to version 8.0.0
Oct 14, 2016
db80446
run integration tests in parallel
Oct 14, 2016
a312a70
trigger the CI build
Oct 14, 2016
bfd01e2
run integration tests sequentially
Oct 14, 2016
a55844f
trigger the CI build
Oct 14, 2016
530f09e
try to fix tests
Oct 14, 2016
4a90f55
Use user-defined symbol
rneatherway Oct 14, 2016
ed76b63
Merge remote-tracking branch 'rneatherway/xplat-tests' into enrich-de…
Oct 14, 2016
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
15 changes: 8 additions & 7 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,24 @@ let integrationTests =

let runIntegrationTest (fn: string) : bool =
let dir = Path.GetDirectoryName fn

tracefn "Running FSIHelper '%s', '%s', '%s'" FSIHelper.fsiPath dir fn
let b, msgs = FSIHelper.executeFSI dir fn []
if not b then
let result, msgs = FSIHelper.executeFSI dir fn []
let msgs = msgs |> Seq.filter (fun x -> x.IsError) |> Seq.toList
if not result then
for msg in msgs do
traceError msg.Message
b
result

Target "IntegrationTest" (fun _ ->
let runOk =
[ for i in integrationTests do
yield runIntegrationTest i ]
integrationTests
|> Seq.map runIntegrationTest
|> Seq.forall id

if not runOk then
failwith "Integration tests did not run successfully"
else

let ok, out, err =
Git.CommandHelper.runGitCommand
"."
Expand Down
4 changes: 2 additions & 2 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NUGET
remote: https://www.nuget.org/api/v2
FAKE (4.37.2)
FParsec (1.0.2)
FSharp.Compiler.Service (6.0.2) - framework: >= net45
FSharp.Compiler.Service (8.0) - framework: >= net45
System.Collections.Immutable (>= 1.2)
System.Reflection.Metadata (>= 1.4.1-beta-24227-04)
FSharp.Compiler.Service.ProjectCracker (6.0.2)
Expand Down Expand Up @@ -37,5 +37,5 @@ NUGET
System.Collections.Immutable (>= 1.2)
GITHUB
remote: fsharp/FAKE
modules/Octokit/Octokit.fsx (934dc8313e2c54793813058fe2540511ad3b8468)
modules/Octokit/Octokit.fsx (889bda9367dfb24f9abb524165a0dbe2cdd86252)
Octokit (>= 0.20)
16 changes: 15 additions & 1 deletion src/FsAutoComplete.Core/CommandResponse.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,18 @@ module internal CompletionUtils =
| Some(s), _ -> s // Is the second number good for anything?
| _, _ -> ("", "")

module CommandResponse =
let getEnclosingEntityChar = function
| FSharpEnclosingEntityKind.Namespace -> "N"
| FSharpEnclosingEntityKind.Module -> "M"
| FSharpEnclosingEntityKind.Class -> "C"
| FSharpEnclosingEntityKind.Exception -> "E"
| FSharpEnclosingEntityKind.Interface -> "I"
| FSharpEnclosingEntityKind.Record -> "R"
| FSharpEnclosingEntityKind.Enum -> "En"
| FSharpEnclosingEntityKind.DU -> "D"

module CommandResponse =

type ResponseMsg<'T> =
{
Kind: string
Expand Down Expand Up @@ -179,6 +189,8 @@ module CommandResponse =
Range: Range.range
BodyRange : Range.range
File : string
EnclosingEntity: string
IsAbstract: bool
}
static member OfDeclarationItem(e:FSharpNavigationDeclarationItem, fn) =
let (glyph, glyphChar) = CompletionUtils.getIcon e.Glyph
Expand All @@ -191,6 +203,8 @@ module CommandResponse =
Range = e.Range
BodyRange = e.BodyRange
File = fn
EnclosingEntity = CompletionUtils.getEnclosingEntityChar e.EnclosingEntityKind
IsAbstract = e.IsAbstract
}

type DeclarationResponse = {
Expand Down
5 changes: 5 additions & 0 deletions src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service.MSBuild.v12">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
<Private>True</Private>
Expand Down
2 changes: 1 addition & 1 deletion src/FsAutoComplete.Suave/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.0.0" />
</dependentAssembly>
</assemblyBinding></runtime>
</configuration>
5 changes: 5 additions & 0 deletions src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service.MSBuild.v12">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
<Private>True</Private>
Expand Down
5 changes: 5 additions & 0 deletions src/FsAutoComplete/FsAutoComplete.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
<ItemGroup>
<Reference Include="FSharp.Compiler.Service.MSBuild.v12">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
Copy link
Copy Markdown
Collaborator

@dsyme dsyme Oct 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have to add this DLL to your VSIX setup files?

Copy link
Copy Markdown
Contributor Author

@vasily-kirichenko vasily-kirichenko Oct 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no VSIX in this project, it's just a library. However, I cannot find how the NuGet package is build and published (nothing in build.fsx)

Copy link
Copy Markdown
Member

@Krzysztof-Cieslak Krzysztof-Cieslak Oct 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no Nuget package, I think. Only GitHub release

Copy link
Copy Markdown
Contributor Author

@vasily-kirichenko vasily-kirichenko Oct 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, ionide does not need nuget package, it just references the repository directly :)

<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FSharp.Compiler.Service">
<HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
<Private>True</Private>
Expand Down
Loading