Source/BooLangService/HandleSmartIndentAction.cs Source/BooLangService/ILineIndenter.cs Source/BooLangService/ISource.cs Source/BooLangStudioSpecs/Intellisense/Stubs/StubSource.cs Source/BooLangStudioSpecs/ViewFilter/WhenHandleSmartIndentActionExecutes.cs Dependencies/Rhino/Castle.DynamicProxy2.dll Dependencies/Rhino/Rhino.Mocks.dll @@ -104,8 +104,10 @@ <Compile Include="Document\Nodes\PropertyTreeNode.cs" /> <Compile Include="Document\Nodes\TypeDeclarationTreeNode.cs" /> <Compile Include="Document\Origins\TypeSourceOrigin.cs" /> + <Compile Include="HandleSmartIndentAction.cs" /> <Compile Include="HierarchyEventArgs.cs" /> <Compile Include="HierarchyListener.cs" /> + <Compile Include="ILineIndenter.cs" /> <Compile Include="Intellisense\DeclarationFinder.cs" /> <Compile Include="Document\CompiledProject.cs" /> <Compile Include="Document\BooParseTreeNodeFlatterner.cs" /> @@ -113,13 +115,13 @@ <Compile Include="Document\Nodes\InterfaceTreeNode.cs" /> <Compile Include="Document\Nodes\IReturnableNode.cs" /> <Compile Include="Intellisense\EntityToTreeNodeConverter.cs" /> - <Compile Include="Intellisense\ILineView.cs" /> <Compile Include="Intellisense\ImportIntellisenseDeclarations.cs" /> <Compile Include="Intellisense\IntellisenseNodeList.cs" /> <Compile Include="Document\Nodes\TryTreeNode.cs" /> <Compile Include="Document\ScopableAttribute.cs" /> <Compile Include="AttributeHelper.cs" /> <Compile Include="Intellisense\Invocation.cs" /> + <Compile Include="ISource.cs" /> <Compile Include="ParseRequestException.cs" /> <Compile Include="StringParsing\BracketPair.cs" /> <Compile Include="StringParsing\BracketPairCollection.cs" /> Source/BooLangService/BooLangService.csproj @@ -5,10 +5,8 @@ using Microsoft.VisualStudio.TextManager.Interop; namespace BooLangService { - public class BooSource : Source, ILineView + public class BooSource : Source, ISource { - private readonly BooProjectSources project; - public BooSource(LanguageService service, IVsTextLines textLines, Colorizer colorizer) : base(service, textLines, colorizer) {} @@ -30,5 +28,20 @@ namespace BooLangService return GetText(span); } + + public int GetIndexOfNextNonWhitespaceChar(int line) + { + return ScanToNonWhitespaceChar(line); + } + + public bool UseTabs + { + get { return LanguageService.Preferences.InsertTabs; } + } + + public void SetText(int line, int endColumn, string newText) + { + SetText(line, 0, line, endColumn, newText); + } } } Source/BooLangService/BooSource.cs @@ -11,11 +11,8 @@ namespace Boo.BooLangService public override bool HandleSmartIndent() { - var indenter = new LineIndenter((BooSource)Source, TextView); - - indenter.SetIndentationForNextLine(); - - return false; + return new HandleSmartIndentAction((ISource)Source, TextView) + .Execute(); } } } \ No newline at end of file Source/BooLangService/BooViewFilter.cs @@ -9,6 +9,7 @@ using Boo.BooLangService.Intellisense; using Boo.BooLangService.StringParsing; using Boo.BooLangStudioSpecs.Document; using Boo.Lang.Compiler.TypeSystem; +using BooLangService; using Microsoft.VisualStudio.Package; namespace Boo.BooLangService.Intellisense @@ -18,13 +19,13 @@ namespace Boo.BooLangService.Intellisense private const string ImportKeyword = "import"; private readonly CompiledProject compiledProject; - private readonly ILineView lineView; + private readonly ISource source; private readonly string fileName; - public DeclarationFinder(CompiledProject compiledProject, ILineView lineView, string fileName) + public DeclarationFinder(CompiledProject compiledProject, ISource source, string fileName) { this.compiledProject = compiledProject; - this.lineView = lineView; + this.source = source; this.fileName = fileName; } @@ -45,7 +46,7 @@ namespace Boo.BooLangService.Intellisense /// <returns>IntellisenseDeclarations</returns> public IntellisenseDeclarations Find(int lineNum, int colNum, ParseReason reason) { - string line = lineView.GetTextUptoPosition(lineNum, colNum); + string line = source.GetTextUptoPosition(lineNum, colNum); bool isImportStatement = line.StartsWith(ImportKeyword); var declarations = (isImportStatement) ? new ImportIntellisenseDeclarations() : new IntellisenseDeclarations(); Source/BooLangService/Intellisense/DeclarationFinder.cs @@ -6,35 +6,30 @@ namespace BooLangService /// <summary> /// Checks the current users line and indents or dedents the next one. /// </summary> - public class LineIndenter + public class LineIndenter : ILineIndenter { // matches comments on the end of a line 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 readonly BooSource source; + private readonly ISource source; private readonly IVsTextView view; private readonly char IndentChar; - public LineIndenter(BooSource source, IVsTextView view) + public LineIndenter(ISource source, IVsTextView view) { this.source = source; this.view = view; - IndentChar = source.LanguageService.Preferences.InsertTabs ? '\t' : ' '; + IndentChar = source.UseTabs ? '\t' : ' '; } /// <summary> - /// Sets the indentation for the next line. + /// Sets the indentation for the next lineNumber. /// </summary> - public void SetIndentationForNextLine() + public void SetIndentationForNextLine(int lineNumber) { - int line; - int col; - - view.GetCaretPos(out line, out col); - - string previousLine = GetPreviousNonWhitespaceLine(line); + string previousLine = GetPreviousNonWhitespaceLine(lineNumber); int indentLevel = GetIndentLevel(previousLine); if (RequiresIndent(previousLine)) @@ -43,10 +38,10 @@ namespace BooLangService indentLevel--; var nextLine = "".PadRight(indentLevel, IndentChar); - var firstChar = source.ScanToNonWhitespaceChar(line); + var firstChar = source.ScanToNonWhitespaceChar(lineNumber); - source.SetText(line, 0, line, firstChar, nextLine); - view.PositionCaretForEditing(line, indentLevel); + source.SetText(lineNumber, firstChar, nextLine); + view.PositionCaretForEditing(lineNumber, indentLevel); } private int GetIndentLevel(string line) Source/BooLangService/LineIndenter.cs @@ -252,7 +252,7 @@ namespace Boo.BooLangService private IBooParseTreeNode FindInScope(ParseRequest request, CompiledProject compiledProject, string find) { var source = languageService.GetSource(request.View); - var finder = new DeclarationFinder(compiledProject, (ILineView)source, request.FileName); + var finder = new DeclarationFinder(compiledProject, (ISource)source, request.FileName); var declarations = finder.Find(request.Line, request.Col, request.Reason); return declarations.Find(n => n.Name.Equals(find, StringComparison.OrdinalIgnoreCase)) as MethodTreeNode; Source/BooLangService/ParseRequestProcessor.cs @@ -53,27 +53,21 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\..\Dependencies\Rhino\Castle.Core.dll</HintPath> </Reference> - <Reference Include="Castle.DynamicProxy2, Version=2.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\Dependencies\Rhino\Castle.DynamicProxy2.dll</HintPath> - </Reference> <Reference Include="Castle.MicroKernel, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\Dependencies\Rhino\Castle.MicroKernel.dll</HintPath> </Reference> - <Reference Include="Castle.Windsor, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL" /> - <Reference Include="MbUnit.AddIn, Version=2.41.232.0, Culture=neutral"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\Dependencies\MbUnit\MbUnit.AddIn.dll</HintPath> - </Reference> - <Reference Include="MbUnit.Framework, Version=2.41.232.0, Culture=neutral, PublicKeyToken=5e72ecd30bc408d5"> + <Reference Include="Castle.Windsor, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\Dependencies\Rhino\Castle.Windsor.dll</HintPath> </Reference> <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <Reference Include="Microsoft.VisualStudio.Package.LanguageService.9.0, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="Microsoft.VisualStudio.TextManager.Interop.9.0" /> - <Reference Include="Rhino.Mocks, Version=3.4.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL"> + <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <Reference Include="Rhino.Mocks, Version=3.5.0.1337, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\Dependencies\Rhino\Rhino.Mocks.dll</HintPath> </Reference> @@ -81,9 +75,6 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\..\Dependencies\Rhino\Rhino.Testing.dll</HintPath> </Reference> - <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> @@ -113,6 +104,7 @@ <Compile Include="Intellisense\LineEntityParserTests.cs" /> <Compile Include="Intellisense\WhenParsingMultipleFilesForIntellisense.cs" /> <Compile Include="Intellisense\WhenShowingIntellisenseForNamespaceSuggestion.cs" /> + <Compile Include="WhenHandleSmartIndentActionExecutes.cs" /> <Compile Include="LineScanner\LexingBaseFixture.cs" /> <Compile Include="LineScanner\LineCommentLexing.cs" /> <Compile Include="LineScanner\MalformedStrings.cs" /> @@ -152,7 +144,7 @@ <Compile Include="Intellisense\BaseCompilerContext.cs" /> <Compile Include="Intellisense\WhenDisplayingDescriptionsForIntellisense.cs" /> <Compile Include="Intellisense\Stubs\AssemblyReferenceFake.cs" /> - <Compile Include="Intellisense\Stubs\SimpleStubLineView.cs" /> + <Compile Include="Intellisense\Stubs\StubSource.cs" /> <Compile Include="Intellisense\WhenParsingSingleFileForIntellisense.cs" /> <Compile Include="Intellisense\WhenShowingIntellisenseAtImportStatement.cs" /> <Compile Include="Intellisense\WhenShowingIntellisenseForMemberSuggestion.cs" /> Source/BooLangStudioSpecs/BooLangStudioSpecs.csproj @@ -49,7 +49,7 @@ namespace Boo.BooLangStudioSpecs.Intellisense protected DeclarationFinder CreateFinder(params Assembly[] assemblies) { - var lineView = new SimpleStubLineView(CaretLocation.LineSource); + var lineView = new StubSource(CaretLocation.LineSource); return new DeclarationFinder(Project, lineView, CaretLocation.FileName); } Source/BooLangStudioSpecs/Intellisense/CompilationOutput.cs Dependencies/Rhino/Castle.Core.pdb Dependencies/Rhino/Castle.DynamicProxy2.pdb Dependencies/Rhino/Castle.MicroKernel.pdb Dependencies/Rhino/Castle.Windsor.pdb Dependencies/Rhino/Rhino.Mocks.pdb Dependencies/Rhino/Rhino.Mocks.xml Dependencies/Rhino/Rhino.Testing.pdb Source/BooLangService/Intellisense/ILineView.cs Source/BooLangStudioSpecs/Intellisense/Stubs/SimpleStubLineView.cs 6dfa1b52c1419512ac5b5da61c09a913f75eaa1c James Gregory james@jagregory.com http://github.com/jagregory/boolangstudio/commit/443929113ca77ae3c4613691f06f043f9d8f8d77 443929113ca77ae3c4613691f06f043f9d8f8d77 2008-10-14T13:55:09-07:00 2008-10-14T13:55:09-07:00 Added indentation tests and updated Rhino Mocks * Added a few tests for the indentation code, but there is still some stuff left to cover. * Upgrade Rhino Mocks to 3.5, this meant updating some of the Castle stuff too. c4d41e006039e5ce12b7763ff35650edca9cfe44 James Gregory james@jagregory.com