ddur 10 years ago
parent
commit
011909fd34
  1. 2
      src/AddIns/Analysis/CodeQuality/CodeQuality.csproj
  2. 2
      src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj
  3. 2
      src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj
  4. 2
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
  5. 4
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs
  6. 24
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionContext.cs
  7. 2
      src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj
  8. 1
      src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpFormattingTests.cs
  9. 2
      src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
  10. 2
      src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj
  11. 2
      src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj
  12. 2
      src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
  13. 2
      src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj
  14. 2
      src/AddIns/Misc/PackageManagement/Cmdlets/Test/PackageManagement.Cmdlets.Tests.csproj
  15. 2
      src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
  16. 2
      src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
  17. 2
      src/Libraries/AvalonEdit
  18. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  19. 2
      src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs
  20. 2
      src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj
  21. 2
      src/Main/SharpDevelop/SharpDevelop.csproj

2
src/AddIns/Analysis/CodeQuality/CodeQuality.csproj

@ -134,7 +134,7 @@ @@ -134,7 +134,7 @@
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
<Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
<Project>{2b8f4f83-c2b3-4e84-a27b-8dee1be0e006}</Project>
<Name>ICSharpCode.NRefactory.Cecil</Name>
<Private>False</Private>
</ProjectReference>

2
src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj

@ -173,7 +173,7 @@ @@ -173,7 +173,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\X64Converter\Profiler.X64Converter.csproj">
<Project>{600D7F63-DACE-4933-BE8C-B51A948A86D4}</Project>
<Project>{fe88fe17-d9fb-4fcc-9a35-6bffb6b26cc6}</Project>
<Name>Profiler.X64Converter</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

2
src/AddIns/Analysis/UnitTesting/Test/UnitTesting.Tests.csproj

@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
<Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
<Project>{2b8f4f83-c2b3-4e84-a27b-8dee1be0e006}</Project>
<Name>ICSharpCode.NRefactory.Cecil</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">

2
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj

@ -256,7 +256,7 @@ @@ -256,7 +256,7 @@
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj">
<Project>{9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1}</Project>
<Project>{7d7e92df-aceb-4b69-92c8-8ac7a703cd57}</Project>
<Name>FormsDesigner</Name>
<Private>False</Private>
</ProjectReference>

4
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionBinding.cs

@ -129,7 +129,9 @@ namespace CSharpBinding.Completion @@ -129,7 +129,9 @@ namespace CSharpBinding.Completion
triggerWordLength = 0;
}
completionData = cce.GetCompletionData(startPos, true);
completionData = completionData.Concat(cce.GetImportCompletionData(startPos));
if (!completionContext.OnlyTypeMembersFitAtPosition(startPos)) {
completionData = completionData.Concat(cce.GetImportCompletionData(startPos));
}
} else {
startPos = caretOffset;
if (char.IsLetterOrDigit (completionChar) || completionChar == '_') {

24
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpCompletionContext.cs

@ -80,6 +80,30 @@ namespace CSharpBinding.Completion @@ -80,6 +80,30 @@ namespace CSharpBinding.Completion
return new CSharpCompletionContext(editor, EmptyList<string>.Instance, compilation, projectContent, document, unresolvedFile, currentLocation);
}
/// <summary>
/// Look back for the nearest char that is not a part of an identifier or a whitespace.
/// (We don't stop on whitespaces because it is legal to have a piece of code like "Foo. Bar(). Baz()")
/// If the char we found is a dot, then the code completion suggestions should only include type members,
/// but not types from the outer scope.
/// If the char we found is not a dot (e. g., a semicolon), then the code completion suggestions can include type names.
/// </summary>
internal bool OnlyTypeMembersFitAtPosition(int offset)
{
var c = '\0';
var pos = offset - 1;
while (pos >= 0) {
c = Document.GetCharAt(pos);
if (!char.IsLetterOrDigit(c) && c != '_' && !char.IsWhiteSpace(c))
break;
pos--;
}
if (pos == -1 || c != '.')
return false;
return true;
}
private CSharpCompletionContext(ITextEditor editor, IList<string> conditionalSymbols, ICompilation compilation, IProjectContent projectContent, IDocument document, CSharpUnresolvedFile unresolvedFile, TextLocation caretLocation)
{

2
src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj

@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
<Name>ICSharpCode.AvalonEdit</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
<Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
<Project>{2b8f4f83-c2b3-4e84-a27b-8dee1be0e006}</Project>
<Name>ICSharpCode.NRefactory.Cecil</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj">

1
src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpFormattingTests.cs

@ -26,7 +26,6 @@ namespace CSharpBinding.Tests @@ -26,7 +26,6 @@ namespace CSharpBinding.Tests
public class CSharpFormattingTests
{
[Test]
[Ignore("AvalonEdit indentation changed")]
public void EnterInsideString()
{
const string start = "class X {\n" +

2
src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj

@ -253,7 +253,7 @@ @@ -253,7 +253,7 @@
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj">
<Project>{9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1}</Project>
<Project>{7d7e92df-aceb-4b69-92c8-8ac7a703cd57}</Project>
<Name>FormsDesigner</Name>
<Private>False</Private>
</ProjectReference>

2
src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj

@ -323,7 +323,7 @@ @@ -323,7 +323,7 @@
<Name>ICSharpCode.Core.WinForms</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj">
<Project>{9E951B9F-6AC2-4537-9D0B-0AE7C026D5A1}</Project>
<Project>{7d7e92df-aceb-4b69-92c8-8ac7a703cd57}</Project>
<Name>FormsDesigner</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\DisplayBindings\XmlEditor\Project\XmlEditor.csproj">

2
src/AddIns/BackendBindings/XamlBinding/XamlBinding.Tests/XamlBinding.Tests.csproj

@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
<Name>ICSharpCode.AvalonEdit</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
<Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
<Project>{2b8f4f83-c2b3-4e84-a27b-8dee1be0e006}</Project>
<Name>ICSharpCode.NRefactory.Cecil</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">

2
src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj

@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
<Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
<Project>{2b8f4f83-c2b3-4e84-a27b-8dee1be0e006}</Project>
<Name>ICSharpCode.NRefactory.Cecil</Name>
<Private>False</Private>
</ProjectReference>

2
src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj

@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\SharpDevelop.EnvDTE\SharpDevelop.EnvDTE.vbproj">
<Project>{6FB1260D-68A2-41A0-BB09-F5F710842E99}</Project>
<Project>{1b753d7f-7c77-4d5e-b928-02982690879c}</Project>
<Name>SharpDevelop.EnvDTE</Name>
<Private>False</Private>
</ProjectReference>

2
src/AddIns/Misc/PackageManagement/Cmdlets/Test/PackageManagement.Cmdlets.Tests.csproj

@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
<Name>PackageManagement</Name>
</ProjectReference>
<ProjectReference Include="..\..\SharpDevelop.EnvDTE\SharpDevelop.EnvDTE.vbproj">
<Project>{6FB1260D-68A2-41A0-BB09-F5F710842E99}</Project>
<Project>{1b753d7f-7c77-4d5e-b928-02982690879c}</Project>
<Name>SharpDevelop.EnvDTE</Name>
</ProjectReference>
<ProjectReference Include="..\..\Test\PackageManagement.Tests.csproj">

2
src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj

@ -569,7 +569,7 @@ @@ -569,7 +569,7 @@
<Name>PackageManagement.PowerShell</Name>
</ProjectReference>
<ProjectReference Include="..\SharpDevelop.EnvDTE\SharpDevelop.EnvDTE.vbproj">
<Project>{6FB1260D-68A2-41A0-BB09-F5F710842E99}</Project>
<Project>{1b753d7f-7c77-4d5e-b928-02982690879c}</Project>
<Name>SharpDevelop.EnvDTE</Name>
<Private>False</Private>
</ProjectReference>

2
src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj

@ -393,7 +393,7 @@ @@ -393,7 +393,7 @@
<Name>PackageManagement</Name>
</ProjectReference>
<ProjectReference Include="..\SharpDevelop.EnvDTE\SharpDevelop.EnvDTE.vbproj">
<Project>{6FB1260D-68A2-41A0-BB09-F5F710842E99}</Project>
<Project>{1b753d7f-7c77-4d5e-b928-02982690879c}</Project>
<Name>SharpDevelop.EnvDTE</Name>
</ProjectReference>
</ItemGroup>

2
src/Libraries/AvalonEdit

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 4e69c3cbc51ddf1ac47030abf0c4caac520d23cf
Subproject commit 19611add5ac9fea77a41a145fc85211c6c32f921

2
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -946,7 +946,7 @@ @@ -946,7 +946,7 @@
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
<Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
<Project>{2b8f4f83-c2b3-4e84-a27b-8dee1be0e006}</Project>
<Name>ICSharpCode.NRefactory.Cecil</Name>
<Private>False</Private>
</ProjectReference>

2
src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs

@ -55,7 +55,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -55,7 +55,7 @@ namespace ICSharpCode.SharpDevelop.Project
return Guid.Empty;
}
set {
SetEvaluatedMetadata("Project", value.ToString("B").ToUpperInvariant());
SetEvaluatedMetadata("Project", value.ToString("B"));
}
}

2
src/Main/Base/Test/ICSharpCode.SharpDevelop.Tests.csproj

@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
<Name>ICSharpCode.AvalonEdit</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
<Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
<Project>{2b8f4f83-c2b3-4e84-a27b-8dee1be0e006}</Project>
<Name>ICSharpCode.NRefactory.Cecil</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">

2
src/Main/SharpDevelop/SharpDevelop.csproj

@ -277,7 +277,7 @@ @@ -277,7 +277,7 @@
<Name>Mono.Cecil</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\NRefactory\ICSharpCode.NRefactory.Cecil\ICSharpCode.NRefactory.Cecil.csproj">
<Project>{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}</Project>
<Project>{2b8f4f83-c2b3-4e84-a27b-8dee1be0e006}</Project>
<Name>ICSharpCode.NRefactory.Cecil</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp.Refactoring\ICSharpCode.NRefactory.CSharp.Refactoring.csproj">

Loading…
Cancel
Save