Source/BooLangService/StringParsing/BracketPair.cs Source/BooLangService/StringParsing/BracketPairCollection.cs Source/BooLangService/StringParsing/BracketPairFinder.cs Source/BooLangService/StringParsing/BracketPairType.cs Source/BooLangService/StringParsing/ExcludingStringLiteralsStringWalker.cs Source/BooLangStudioSpecs/StringParsing/BracketPairFinderTests.cs @@ -118,6 +118,11 @@ <Compile Include="Document\ScopableAttribute.cs" /> <Compile Include="AttributeHelper.cs" /> <Compile Include="Intellisense\Invocation.cs" /> + <Compile Include="StringParsing\BracketPair.cs" /> + <Compile Include="StringParsing\BracketPairCollection.cs" /> + <Compile Include="StringParsing\BracketPairFinder.cs" /> + <Compile Include="StringParsing\BracketPairType.cs" /> + <Compile Include="StringParsing\ExcludingStringLiteralsStringWalker.cs" /> <Compile Include="StringParsing\LineEntityParser.cs" /> <Compile Include="StringParsing\StringPosition.cs" /> <Compile Include="StringParsing\StringWalker.cs" /> Source/BooLangService/BooLangService.csproj @@ -134,30 +134,21 @@ namespace Boo.BooLangService { Debug.WriteLine("HighlightBraces"); - var pairs = new Dictionary<char, char> - { - {'(', ')'}, - {'{', '}'}, - {'[', ']'} - }; var source = languageService.GetSource(request.View); + var indexOfOriginal = source.GetPositionOfLineIndex(request.Line, request.Col - 1); - var stringMatcher = new ExcludeStringMatcher(request.Text); - - int indexOfOriginal = source.GetPositionOfLineIndex(request.Line, request.Col - 1); - char original = request.Text[indexOfOriginal]; - - stringMatcher.SetStartIndex(indexOfOriginal); + var bracketFinder = new BracketPairFinder(BracketPairType.FromChar(request.Text[indexOfOriginal])); + var bracketPairs = bracketFinder.FindPairs(request.Text); - int? nextIndex = stringMatcher.FindNextIndex(pairs[original]); + int? partner = bracketPairs.FindPartnerIndex(indexOfOriginal); - if (nextIndex != null) + if (partner != null) { request.Sink.FoundMatchingBrace = true; int nextLine, nextCol; - source.GetLineIndexOfPosition(nextIndex.Value, out nextLine, out nextCol); + source.GetLineIndexOfPosition(partner.Value, out nextLine, out nextCol); request.Sink.MatchPair( new TextSpan Source/BooLangService/ParseRequestProcessor.cs @@ -34,10 +34,16 @@ namespace Boo.BooLangService.StringParsing else if (currentChar == BackSlash && StateIs(StringWalkerState.InsideString)) currentIndex += 1; // skip next (escaped) char - yield return new StringPosition(currentChar, currentIndex); + if (ShouldYield(currentChar)) + yield return new StringPosition(currentChar, currentIndex); } } + protected virtual bool ShouldYield(char currentChar) + { + return true; + } + public bool StateIs(StringWalkerState expectedState) { if (state.Count == 0) return false; Source/BooLangService/StringParsing/StringWalker.cs @@ -104,7 +104,6 @@ <Compile Include="Intellisense\CaretNotFoundException.cs" /> <Compile Include="Intellisense\CompilationOutput.cs" /> <Compile Include="Intellisense\Constants.cs" /> - <Compile Include="Intellisense\FakeAuthoringSink.cs" /> <Compile Include="Intellisense\FixtureCompiler.cs" /> <Compile Include="Intellisense\IntellisenseDeclarationsTestExtensionMethods.cs" /> <Compile Include="Intellisense\LineEntityParserTests.cs" /> @@ -156,6 +155,7 @@ <Compile Include="Intellisense\WhenShowingIntellisenseInMethodBody.cs" /> <Compile Include="Intellisense\WhenShowingToolTipForMethod.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="StringParsing\BracketPairFinderTests.cs" /> <Compile Include="StringParsing\ExcludeStringMatcherTests.cs" /> </ItemGroup> <ItemGroup> Source/BooLangStudioSpecs/BooLangStudioSpecs.csproj e0116dcaad0efb5fe766a59f1befb56213f51d12 James Gregory james@jagregory.com http://github.com/jagregory/boolangstudio/commit/54d4bcef79d4dbd2ff6cf1fbd9b0a15f325f5c41 54d4bcef79d4dbd2ff6cf1fbd9b0a15f325f5c41 2008-09-01T16:37:38-07:00 2008-09-01T16:37:38-07:00 Some changes to brace matching. Changed the way brackets are found in the source, which allows highlighting to be done from left or right. bda18d73a0d03eb226a5b5a79b351446ff365cfb James Gregory james@jagregory.com