Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Krüger <mkrueger@xamarin.com>2015-04-17 09:40:15 +0300
committerMike Krüger <mkrueger@xamarin.com>2015-04-17 09:40:15 +0300
commit6975e58500516632132e225f2c1b04eb09d97b31 (patch)
treec12002cb7efda03fdabd8ad34c03c8bd9e949453
parent427b0a002f7e797a368b196de802f69f45e99ad5 (diff)
[Ide] Introduced a way to handle competing completion extensions in
projections. The projected filter completion should filter completion relevant events for the original completion extension if a projected completion extension should handle them.
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs5
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedFilterCompletionTextEditorExtension.cs186
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs7
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj1
4 files changed, 197 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
index a6995cf88f..2425d511de 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Extension/CompletionTextEditorExtension.cs
@@ -519,6 +519,11 @@ namespace MonoDevelop.Ide.Editor.Extension
// document.Editor.Parent.TextArea.FocusOutEvent += HandleFocusOutEvent;
}
+ internal void InternalInitialize ()
+ {
+ Initialize ();
+ }
+
void HandlePositionChanged (object sender, EventArgs e)
{
CompletionWindowManager.UpdateCursorPosition ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedFilterCompletionTextEditorExtension.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedFilterCompletionTextEditorExtension.cs
new file mode 100644
index 0000000000..15b3ecfc61
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedFilterCompletionTextEditorExtension.cs
@@ -0,0 +1,186 @@
+//
+// ProjectedFilterCompletionTextEditorExtension.cs
+//
+// Author:
+// Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Editor.Extension;
+
+namespace MonoDevelop.Ide.Editor.Projection
+{
+ sealed class ProjectedFilterCompletionTextEditorExtension : CompletionTextEditorExtension, IProjectionExtension
+ {
+ CompletionTextEditorExtension completionTextEditorExtension;
+ IReadOnlyList<Projection> projections;
+
+ IReadOnlyList<Projection> IProjectionExtension.Projections {
+ get {
+ return projections;
+ }
+ set {
+ projections = value;
+ }
+ }
+
+ public ProjectedFilterCompletionTextEditorExtension (CompletionTextEditorExtension completionTextEditorExtension, IReadOnlyList<Projection> projections)
+ {
+ this.completionTextEditorExtension = completionTextEditorExtension;
+ this.projections = projections;
+ }
+
+ bool IsInProjection ()
+ {
+ int offset = Editor.CaretOffset;
+ foreach (var p in projections) {
+ foreach (var seg in p.ProjectedSegments) {
+ if (seg.ContainsOriginal (offset))
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public override bool KeyPress (KeyDescriptor descriptor)
+ {
+ if (IsInProjection())
+ return Next == null || Next.KeyPress (descriptor);
+ return completionTextEditorExtension.KeyPress (descriptor);
+ }
+
+ public override bool IsValidInContext (DocumentContext context)
+ {
+ if (IsInProjection())
+ return false;
+ return completionTextEditorExtension.IsValidInContext (context);
+ }
+
+ public override int GetCurrentParameterIndex (int startOffset)
+ {
+ if (IsInProjection())
+ return -1;
+ return completionTextEditorExtension.GetCurrentParameterIndex (startOffset);
+ }
+
+ public override string CompletionLanguage {
+ get {
+ return completionTextEditorExtension.CompletionLanguage;
+ }
+ }
+
+ public override void RunCompletionCommand ()
+ {
+ if (IsInProjection ())
+ return;
+ completionTextEditorExtension.RunCompletionCommand ();
+ }
+
+ public override void RunShowCodeTemplatesWindow ()
+ {
+ if (IsInProjection ())
+ return;
+ completionTextEditorExtension.RunShowCodeTemplatesWindow ();
+ }
+
+ public override void RunParameterCompletionCommand ()
+ {
+ if (IsInProjection ())
+ return;
+ completionTextEditorExtension.RunParameterCompletionCommand ();
+ }
+
+ public override bool CanRunCompletionCommand ()
+ {
+ if (IsInProjection ())
+ return false;
+ return completionTextEditorExtension.CanRunCompletionCommand ();
+ }
+
+ public override bool CanRunParameterCompletionCommand ()
+ {
+ if (IsInProjection ())
+ return false;
+ return completionTextEditorExtension.CanRunParameterCompletionCommand ();
+ }
+
+ public override System.Threading.Tasks.Task<CodeCompletion.ICompletionDataList> HandleCodeCompletionAsync (CodeCompletion.CodeCompletionContext completionContext, char completionChar, System.Threading.CancellationToken token)
+ {
+ return completionTextEditorExtension.HandleCodeCompletionAsync (completionContext, completionChar, token);
+ }
+
+ public override System.Threading.Tasks.Task<CodeCompletion.ParameterHintingResult> HandleParameterCompletionAsync (CodeCompletion.CodeCompletionContext completionContext, char completionChar, System.Threading.CancellationToken token)
+ {
+ return completionTextEditorExtension.HandleParameterCompletionAsync (completionContext, completionChar, token);
+ }
+
+ public override bool GetCompletionCommandOffset (out int cpos, out int wlen)
+ {
+ if (IsInProjection ()) {
+ cpos = 0; wlen = 0;
+ return false;
+ }
+ return completionTextEditorExtension.GetCompletionCommandOffset (out cpos, out wlen);
+ }
+
+ public override CodeCompletion.ICompletionDataList ShowCodeSurroundingsCommand (CodeCompletion.CodeCompletionContext completionContext)
+ {
+ if (IsInProjection ()) return null;
+ return completionTextEditorExtension.ShowCodeSurroundingsCommand (completionContext);
+ }
+
+ public override CodeCompletion.ICompletionDataList ShowCodeTemplatesCommand (CodeCompletion.CodeCompletionContext completionContext)
+ {
+ if (IsInProjection ()) return null;
+ return completionTextEditorExtension.ShowCodeTemplatesCommand (completionContext);
+ }
+
+ public override CodeCompletion.ICompletionDataList CodeCompletionCommand (CodeCompletion.CodeCompletionContext completionContext)
+ {
+ if (IsInProjection ()) return null;
+ return completionTextEditorExtension.CodeCompletionCommand (completionContext);
+ }
+
+ public override CodeCompletion.ParameterHintingResult ParameterCompletionCommand (CodeCompletion.CodeCompletionContext completionContext)
+ {
+ if (IsInProjection ()) return null;
+ return completionTextEditorExtension.ParameterCompletionCommand (completionContext);
+ }
+
+ public override int GuessBestMethodOverload (CodeCompletion.ParameterHintingResult provider, int currentOverload)
+ {
+ if (IsInProjection ()) return -1;
+ return completionTextEditorExtension.GuessBestMethodOverload (provider, currentOverload);
+ }
+
+ protected override void Initialize ()
+ {
+ completionTextEditorExtension.InternalInitialize ();
+ }
+
+ public override void Dispose ()
+ {
+ completionTextEditorExtension.Dispose ();
+ }
+ }
+}
+
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs
index f143276e14..705b6e58e5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditor.cs
@@ -1223,15 +1223,18 @@ namespace MonoDevelop.Ide.Editor
return;
TextEditorExtension lastExtension = textEditorImpl.EditorExtension;
- while (lastExtension != null && lastExtension.Next != null)
+ while (lastExtension != null && lastExtension.Next != null) {
+ var completionTextEditorExtension = lastExtension.Next as CompletionTextEditorExtension;
+ if (completionTextEditorExtension != null)
+ lastExtension.Next = new ProjectedFilterCompletionTextEditorExtension (completionTextEditorExtension, projections) { Next = completionTextEditorExtension.Next };
lastExtension = lastExtension.Next;
+ }
// no extensions -> no projections needed
if (textEditorImpl.EditorExtension == null)
return;
if ((disabledFeatures & DisabledProjectionFeatures.Completion) != DisabledProjectionFeatures.Completion) {
-
var projectedCompletionExtension = new ProjectedCompletionExtension (ctx, projections);
projectedCompletionExtension.Next = textEditorImpl.EditorExtension;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index f96760a646..0d5e43f1c5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -3473,6 +3473,7 @@
<Compile Include="MonoDevelop.Ide.CodeCompletion\MruCache.cs" />
<Compile Include="MonoDevelop.Ide.Editor\TooltipExtensionNode.cs" />
<Compile Include="MonoDevelop.Ide.Editor\Projection\IProjectionExtension.cs" />
+ <Compile Include="MonoDevelop.Ide.Editor\Projection\ProjectedFilterCompletionTextEditorExtension.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Makefile.am" />