Skip to content

Commit d75dcca

Browse files
lukebuehlerlukebuehler
committed
moved code completion to the main CShell project, updated binaries
1 parent a22e2aa commit d75dcca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2275
-9742
lines changed

‎Lib/ICSharpCode.AvalonEdit.dll‎

-572 KB
Binary file not shown.

‎Lib/ICSharpCode.AvalonEdit.xml‎

Lines changed: 0 additions & 9641 deletions
This file was deleted.

‎Lib/ICSharpCode.CodeCompletion.dll‎

-39 KB
Binary file not shown.

‎Lib/ICSharpCode.CodeCompletion.xml‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎Lib/Mono.CSharp.dll‎

-1.19 MB
Binary file not shown.

‎Lib/README.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
Most packages are installed using NuGet (see main readme.md).
22

3-
But AvalonEdit and NRefactory is installed from a custom build. The source code can be found here: https://github.com/lukebuehler/NRefactory-Completion-Sample
3+
NRefactory is installed from the latest build from GitHub since they update NuGet too infrequently.
4+
https://github.com/icsharpcode/NRefactory
5+
6+
The XhtmlDumper project can be found on GitHub as well.
7+
https://github.com/lukebuehler/XhtmlDumper

‎Scripts/Tutorial.csx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ x + x;
2929

3030
// The state is preserved now just enter "x" in the REPL and hit enter: The variable "x" containing the value 7 is still there.
3131

32-
// Methods can be declared too, but only in classes. Select the class and send it to the REPL:
33-
// (It's commented out so as not to mess up the code completion, execute it without the comments)
32+
// Methods can be declared too, but only in classes. Select the class and send it to the REPL.
33+
// Select lines 35-45 and press Alt+Enter, to evaluate the class an make it available for later.
3434
/*
3535
static class MyMath
3636
{

‎Src/CShell.sln‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.30110.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{CE1B7BD1-A200-4887-8090-42C10D816D2F}"
57
ProjectSection(SolutionItems) = preProject
68
..\Doc\Links.txt = ..\Doc\Links.txt
@@ -19,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{4A604F
1921
EndProject
2022
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CShell", "CShell\CShell.csproj", "{751E2557-C070-480D-A3B9-662CDFE03907}"
2123
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CShellCore.CodeCompletion", "CShellCore.CodeCompletion\CShellCore.CodeCompletion.csproj", "{2ADF8E19-B896-4778-8391-BC55FB100852}"
25+
EndProject
2226
Global
2327
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2428
Debug|Any CPU = Debug|Any CPU
@@ -41,6 +45,12 @@ Global
4145
{751E2557-C070-480D-A3B9-662CDFE03907}.Release|Any CPU.Build.0 = Release|Any CPU
4246
{751E2557-C070-480D-A3B9-662CDFE03907}.Release|x86.ActiveCfg = Release|x86
4347
{751E2557-C070-480D-A3B9-662CDFE03907}.Release|x86.Build.0 = Release|x86
48+
{2ADF8E19-B896-4778-8391-BC55FB100852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49+
{2ADF8E19-B896-4778-8391-BC55FB100852}.Debug|Any CPU.Build.0 = Debug|Any CPU
50+
{2ADF8E19-B896-4778-8391-BC55FB100852}.Debug|x86.ActiveCfg = Debug|Any CPU
51+
{2ADF8E19-B896-4778-8391-BC55FB100852}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{2ADF8E19-B896-4778-8391-BC55FB100852}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{2ADF8E19-B896-4778-8391-BC55FB100852}.Release|x86.ActiveCfg = Release|Any CPU
4454
EndGlobalSection
4555
GlobalSection(SolutionProperties) = preSolution
4656
HideSolutionNode = FALSE

‎Src/CShell/AppBootstrapper.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,27 @@ protected override void Configure()
5656
{
5757
//to start we just add the already loaded assemblies to the container & the assemblies in exe folder
5858
var directoryCatalog = new DirectoryCatalog(@"./");
59+
60+
//use this code to look into loader exceptions, the code bellow is faster.
61+
//try
62+
//{
63+
// // load the assembly or type
64+
// foreach (var part in directoryCatalog.Parts)
65+
// {
66+
// var assembly = ReflectionModelServices.GetPartType(part).Value.Assembly;
67+
// if (!AssemblySource.Instance.Contains(assembly))
68+
// AssemblySource.Instance.Add(assembly);
69+
// }
70+
//}
71+
//catch (Exception ex)
72+
//{
73+
// if (ex is System.Reflection.ReflectionTypeLoadException)
74+
// {
75+
// var typeLoadException = ex as ReflectionTypeLoadException;
76+
// var loaderExceptions = typeLoadException.LoaderExceptions;
77+
// }
78+
//}
79+
5980
AssemblySource.Instance.AddRange(
6081
directoryCatalog.Parts
6182
.AsParallel()

‎Src/CShell/CShell.csproj‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,9 @@
7171
<SpecificVersion>False</SpecificVersion>
7272
<HintPath>..\..\Lib\Caliburn.Micro.1.5.2\lib\net40\Caliburn.Micro.dll</HintPath>
7373
</Reference>
74-
<Reference Include="ICSharpCode.AvalonEdit, Version=4.2.0.8783, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
74+
<Reference Include="ICSharpCode.AvalonEdit, Version=4.4.2.9744, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
7575
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\Lib\ICSharpCode.AvalonEdit.dll</HintPath>
77-
</Reference>
78-
<Reference Include="ICSharpCode.CodeCompletion">
79-
<HintPath>..\..\Lib\ICSharpCode.CodeCompletion.dll</HintPath>
76+
<HintPath>..\..\Lib\AvalonEdit.4.4.2.9744\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
8077
</Reference>
8178
<Reference Include="ICSharpCode.NRefactory, Version=5.0.0.0, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
8279
<SpecificVersion>False</SpecificVersion>
@@ -96,14 +93,20 @@
9693
<Reference Include="PresentationCore" />
9794
<Reference Include="PresentationFramework" />
9895
<Reference Include="WindowsFormsIntegration" />
99-
<Reference Include="Xceed.Wpf.AvalonDock">
100-
<HintPath>..\..\Lib\Extended.Wpf.Toolkit.2.0.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
96+
<Reference Include="Xceed.Wpf.AvalonDock, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
97+
<SpecificVersion>False</SpecificVersion>
98+
<HintPath>..\..\Lib\AvalonDock.2.0.2000\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
99+
</Reference>
100+
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
101+
<SpecificVersion>False</SpecificVersion>
102+
<HintPath>..\..\Lib\AvalonDock.2.0.2000\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
101103
</Reference>
102-
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010">
103-
<HintPath>..\..\Lib\Extended.Wpf.Toolkit.2.0.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
104+
<Reference Include="Xceed.Wpf.DataGrid">
105+
<HintPath>..\..\Lib\Extended.Wpf.Toolkit.2.1.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
104106
</Reference>
105-
<Reference Include="Xceed.Wpf.Toolkit">
106-
<HintPath>..\..\Lib\Extended.Wpf.Toolkit.2.0.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
107+
<Reference Include="Xceed.Wpf.Toolkit, Version=2.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
108+
<SpecificVersion>False</SpecificVersion>
109+
<HintPath>..\..\Lib\Extended.Wpf.Toolkit.2.1.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
107110
</Reference>
108111
<Reference Include="XhtmlDumper">
109112
<HintPath>..\..\Lib\XhtmlDumper.dll</HintPath>
@@ -326,6 +329,10 @@
326329
</Page>
327330
</ItemGroup>
328331
<ItemGroup>
332+
<ProjectReference Include="..\CShellCore.CodeCompletion\CShellCore.CodeCompletion.csproj">
333+
<Project>{2adf8e19-b896-4778-8391-bc55fb100852}</Project>
334+
<Name>CShellCore.CodeCompletion</Name>
335+
</ProjectReference>
329336
<ProjectReference Include="..\CShellCore\CShellCore.csproj">
330337
<Project>{5D2479EA-0D1E-4381-AD9C-998CCEC2DC21}</Project>
331338
<Name>CShellCore</Name>

0 commit comments

Comments
 (0)