← Back to branch summary

~ubuntu-branches/ubuntu/saucy/monodevelop/saucy-proposed

« back to all changes in this revision

Viewing changes to src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2012-06-22 20:35:35 UTC
  • mfrom: (10.3.2)
  • Revision ID: package-import@ubuntu.com-20120622203535-zrozwvcf6kfk6l6i
Tags: 3.0.3.2+dfsg-1
* [3fd89ae] Imported Upstream version 3.0.3.2+dfsg
* [379a680] Remove old patches we haven't used for ages from git.
* [d71161d] Remove correct_paths_in_monodevelop-core-addins.pc.patch.
  Upstream claim to have fixed this by moving assembly install locations.
* [15dbfb9] Fix install location for MonoDevelop.Gettext.dll.config.
* [26eb434] Fix install location for MonoDevelop.SourceEditor2.dll.config.
* [4169974] Upstream commit 53282c9 which finally reconciles the 
  MonoDevelop.Gettext.dll install location with the 
  monodevelop-core-addins.pc location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs
279
279
                                this.CurSpan = span;
280
280
                        }
281
281
 
282
 
                        public void PopSpan ()
 
282
                        public Span PopSpan ()
283
283
                        {
284
 
                                if (spanStack.Count > 0)
285
 
                                        spanStack.Pop ();
 
284
                                Span result = null;
 
285
                                if (spanStack.Count > 0) {
 
286
                                        result = spanStack.Pop ();
 
287
                                }
286
288
                                if (ruleStack.Count > 1)
287
289
                                        ruleStack.Pop ();
288
290
                                this.CurRule = ruleStack.Peek ();
289
291
                                this.CurSpan = spanStack.Count > 0 ? spanStack.Peek () : null;
 
292
                                return result;
290
293
                        }
291
294
 
292
295
                        public Rule GetRule (Span span)
321
324
                        protected virtual void ScanSpan (ref int i)
322
325
                        {
323
326
                                int textOffset = i - StartOffset;
324
 
                                
325
327
                                for (int j = 0; j < CurRule.Spans.Length; j++) {
326
328
                                        Span span = CurRule.Spans [j];
327
329
 
409
411
                                                if (cur.Escape != null) {
410
412
                                                        bool mismatch = false;
411
413
                                                        for (int j = 0; j < cur.Escape.Length; j++) {
412
 
                                                                if (textIndex + j >= CurText.Length || CurText[textIndex + j] != cur.Escape[j]) {
 
414
                                                                if (textIndex + j >= CurText.Length || CurText [textIndex + j] != cur.Escape [j]) {
413
415
                                                                        mismatch = true;
414
416
                                                                        break;
415
417
                                                                }
426
428
                                        }
427
429
                                        ScanSpan (ref i);
428
430
                                        if (i < doc.TextLength)
429
 
                                                ParseChar (ref i, CurText[textIndex]);
 
431
                                                ParseChar (ref i, CurText [textIndex]);
430
432
                                }
431
433
                        }
432
434
                }