Source/BooLangService/BooViewFilter.cs @@ -40,12 +40,18 @@ namespace Boo.BooLangService return "Boo File (*.boo) *.boo"; } + public override ViewFilter CreateViewFilter(CodeWindowManager mgr, IVsTextView newView) + { + return new BooViewFilter(mgr, newView); + } + public override LanguagePreferences GetLanguagePreferences() { if (_languagePreferences == null) { _languagePreferences = new LanguagePreferences(this.Site, typeof(BooLangService).GUID, BooLangService.LanguageName); _languagePreferences.Init(); + _languagePreferences.IndentStyle = IndentingStyle.Smart; } return _languagePreferences; Source/BooLangService/BooLangService.cs @@ -88,6 +88,7 @@ <Compile Include="AssemblyHelper.cs" /> <Compile Include="BooMethods.cs" /> <Compile Include="BooProjectSources.cs" /> + <Compile Include="BooViewFilter.cs" /> <Compile Include="Document\Nodes\NamespaceTreeNode.cs" /> <Compile Include="Document\Nodes\ReferencedNamespaceTreeNode.cs" /> <Compile Include="Document\Nodes\ValueTypeTreeNode.cs" /> Source/BooLangService/BooLangService.csproj @@ -14,30 +14,6 @@ namespace BooLangService {} /// <summary> - /// Occurs when the changes are committed to the document, typically on save, but more - /// importantly on enter. - /// </summary> - /// <param name="reason">Reason why the changes were committed, i.e. Save.</param> - /// <param name="changedArea">TextSpan of where the changes occurred.</param> - public override void OnChangesCommitted(uint reason, TextSpan[] changedArea) - { - base.OnChangesCommitted(reason, changedArea); - - if (((ChangeCommitGestureFlags)reason & ChangeCommitGestureFlags.CCG_CARET_ON_NEW_BUFFER_LINE) == ChangeCommitGestureFlags.CCG_CARET_ON_NEW_BUFFER_LINE) - { - // there's been a newline put in by the user - if (changedArea.Length > 0) - { - // and its actually changed the doc - var indenter = new LineIndenter(this); - - // change the indentation, if necessary - indenter.ChangeIndentation(changedArea[0]); - } - } - } - - /// <summary> /// Gets all text on the specified line upto the column specified. /// </summary> /// <param name="line"></param> Source/BooLangService/BooSource.cs @@ -124,7 +124,7 @@ namespace Boo.BooLangService.Intellisense var scopedParseTree = compiledProject.GetScope(fileName, lineNum); var declarations = new IntellisenseDeclarations(); - AddSpecialTypes(declarations); + // AddSpecialTypes(declarations); AddMembersFromScopeTree(declarations, scopedParseTree); AddKeywords(declarations, scopedParseTree); AddImports(declarations, GetDocument(scopedParseTree)); Source/BooLangService/Intellisense/DeclarationFinder.cs @@ -12,63 +12,71 @@ namespace BooLangService private readonly Regex removeCommentsRegExp = new Regex(@".*((?:#|\/\/|\/\*).*)$", RegexOptions.Compiled); // matches a dedenting code line (pass, return, return xxx, return if x = x, return xxx unless x = x, etc...) private readonly Regex dedentRegExp = new Regex(@"(?:return|pass)(?:[\t ]?[\w]*[\t ]?(?<exp>(?:if|unless)))?", RegexOptions.Compiled); - private const string Indent = " "; private readonly BooSource source; + private readonly IVsTextView view; + private readonly char IndentChar; - public LineIndenter(BooSource source) + public LineIndenter(BooSource source, IVsTextView view) { this.source = source; + this.view = view; + + IndentChar = source.LanguageService.Preferences.InsertTabs ? '\t' : ' '; } /// <summary> - /// Changes the indentation of the current line based on the last - /// bit of code typed. + /// Sets the indentation for the next line. /// </summary> - /// <param name="changedArea">Area of changed code</param> - public void ChangeIndentation(TextSpan changedArea) + public void SetIndentationForNextLine() { - TextSpan area = changedArea; - string text = source.GetText(area); - string line = source.GetTextUptoPosition(area.iStartLine, area.iStartIndex); + int line; + int col; - if (!line.EndsWith(text)) - { - // if commit includes last bit of text typed, the line won't have it yet - // so stick it on for our parsing sanity - // ** probably not the best thing to be doing here, but we can't just - // get the whole line, because we may be pressing return in the centre - // of it - line += text; - } + view.GetCaretPos(out line, out col); - if (RequiresIndent(line)) - { - source.SetText(area, text + Indent); // add an indent to the end of the changed text - MoveCaret(Indent.Length); // move the caret to the new end of line - } - else if (RequiresDedent(line)) + string previousLine = GetPreviousNonWhitespaceLine(line); + int indentLevel = GetIndentLevel(previousLine); + + if (RequiresIndent(previousLine)) + indentLevel++; + else if (RequiresDedent(previousLine) && indentLevel > 0) + indentLevel--; + + var nextLine = "".PadRight(indentLevel, IndentChar); + var firstChar = source.ScanToNonWhitespaceChar(line); + + source.SetText(line, 0, line, firstChar, nextLine); + view.PositionCaretForEditing(line, indentLevel); + } + + private int GetIndentLevel(string line) + { + var count = 0; + + foreach (var c in line) { - source.SetText(area, text.Remove(text.Length - Indent.Length)); // remove an indent - MoveCaret(-Indent.Length); // move caret in a bit + if (c != IndentChar) + break; // got to the text on the line + + count++; } + + return count; } - /// <summary> - /// Moves the caret a set number of columns. - /// </summary> - /// <remarks> - /// Use negative numbers to move left. - /// </remarks> - /// <param name="amount">Number of columns to move.</param> - private void MoveCaret(int amount) + private string GetPreviousNonWhitespaceLine(int startLine) { - IVsTextView view = source.LanguageService.GetPrimaryViewForSource(source); + int prevLineIndex = startLine - 1; + var lineText = source.GetLine(prevLineIndex); - int caretLine = 0; - int caretCol = 0; + //searchig for not blank line + while (prevLineIndex > 0 && string.IsNullOrEmpty(lineText)) + { + prevLineIndex--; + lineText = source.GetLine(prevLineIndex); + } - view.GetCaretPos(out caretLine, out caretCol); - view.SetCaretPos(caretLine, caretCol + amount); + return lineText; } /// <summary> Source/BooLangService/LineIndenter.cs @@ -34,9 +34,13 @@ <StartAction>Project</StartAction> </PropertyGroup> <ItemGroup> + <Reference Include="Boo.Lang, Version=2.0.0.0, Culture=neutral, PublicKeyToken=32c39770e9a21a67, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\Dependencies\boo\build\Boo.Lang.dll</HintPath> + </Reference> <Reference Include="Boo.Lang.Compiler, Version=2.0.0.0, Culture=neutral, PublicKeyToken=32c39770e9a21a67, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\Dependencies\boo\bin\Boo.Lang.Compiler.dll</HintPath> + <HintPath>..\..\Dependencies\boo\build\Boo.Lang.Compiler.dll</HintPath> </Reference> <Reference Include="Boo.Lang.Parser, Version=2.0.0.0, Culture=neutral, PublicKeyToken=32c39770e9a21a67, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> Source/BooLangStudioSpecs/BooLangStudioSpecs.csproj @@ -1,6 +1,6 @@ namespace Test.Project class DummyClass: - pass + pass ~ \ No newline at end of file Source/BooLangStudioSpecs/Intellisense/Fixtures/WhenDisplayingDescriptionsForIntellisense/ClassesArePrefixedWithClassAndUseFullNamespaceName.boo @@ -11,7 +11,7 @@ namespace Boo.BooLangStudioSpecs.Intellisense public void ShowAllReferencedNamespaces() { CompiledFixtures - .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\bin\Boo.Lang.dll")) + .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\build\Boo.Lang.dll")) .GetDeclarations() .AssertPresenceOf("Boo"); } @@ -20,7 +20,7 @@ namespace Boo.BooLangStudioSpecs.Intellisense public void ShowSubNamespacesForPartialImport() { CompiledFixtures - .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\bin\Boo.Lang.dll")) + .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\build\Boo.Lang.dll")) .GetDeclarations() .AssertPresenceOf("Lang"); } @@ -29,7 +29,7 @@ namespace Boo.BooLangStudioSpecs.Intellisense public void ExcludeExposedTypes() { CompiledFixtures - .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\bin\Boo.Lang.dll")) + .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\build\Boo.Lang.dll")) .GetDeclarations() .AssertNonPresenceOf("ICallable", "IQuackFu"); } Source/BooLangStudioSpecs/Intellisense/WhenShowingIntellisenseAtImportStatement.cs @@ -9,7 +9,7 @@ namespace Boo.BooLangStudioSpecs.Intellisense public void IncludeSubNamespaces() { CompiledFixtures - .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\bin\Boo.Lang.dll")) + .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\build\Boo.Lang.dll")) .GetDeclarations() .AssertPresenceOf("Lang"); } @@ -18,7 +18,7 @@ namespace Boo.BooLangStudioSpecs.Intellisense public void IncludeExposedTypes() { CompiledFixtures - .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\bin\Boo.Lang.dll")) + .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\build\Boo.Lang.dll")) .GetDeclarations() .AssertPresenceOf("ICallable", "IQuackFu"); } Source/BooLangStudioSpecs/Intellisense/WhenShowingIntellisenseForNamespaceSuggestion.cs @@ -42,7 +42,7 @@ namespace Boo.BooLangStudioSpecs.Intellisense public void ShowNamespacesFromReferences() { CompiledFixtures - .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\bin\Boo.Lang.dll")) + .SetReferences(Assembly.LoadFrom(@"..\..\..\..\Dependencies\boo\build\Boo.Lang.dll")) .GetDeclarations() .AssertPresenceOf("Boo"); } Source/BooLangStudioSpecs/Intellisense/WhenShowingIntellisenseInMethodBody.cs @@ -6,13 +6,13 @@ namespace Boo.BooLangStudioSpecs.Intellisense { public class WhenShowingToolTipForMethod : BaseCompilerContext { - [Fact(Skip="Not implemented yet.")] + [Fact(Skip="This feature is implemented, but I don't really know how to test for it.")] public void ShowMethodParametersWhenInsideParenthesis() { throw new NotImplementedException(); } - [Fact(Skip = "Not implemented yet.")] + [Fact(Skip = "This feature is implemented, but I don't really know how to test for it.")] public void ShowFullDescriptionForMethod() { throw new NotImplementedException(); Source/BooLangStudioSpecs/Intellisense/WhenShowingToolTipForMethod.cs 706509e44bfaaabf3aeb5cba66e3112e7702478e James Gregory james@jagregory.com http://github.com/jagregory/boolangstudio/commit/6dfa1b52c1419512ac5b5da61c09a913f75eaa1c 6dfa1b52c1419512ac5b5da61c09a913f75eaa1c 2008-10-12T05:47:48-07:00 2008-10-12T05:47:48-07:00 Reimplemented smart indenting, it actually works properly now. 5cc632c37e507774e1c6a28e90e9a02ade030322 James Gregory james@jagregory.com