Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes in parsing/highlighting. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 08 Oct 2013 07:05:59 +0100
branchdevelopment
changeset 2808 13b4f59e3b0a
parent 2807 46f6ef83cce6
child 2809 e3b939ba5a5d
Fixes in parsing/highlighting. - fix in cacheing parsed trees for classes. - do a diet parsing only in JavaSourceDocument to speed up things.
tools/JavaSourceDocument.st file | annotate | diff | comparison | revisions
tools/JavaSourceHighlighter.st file | annotate | diff | comparison | revisions 
--- a/tools/JavaSourceDocument.st	Mon Oct 07 19:16:50 2013 +0100
+++ b/tools/JavaSourceDocument.st	Tue Oct 08 07:05:59 2013 +0100
@@ -363,7 +363,7 @@
                     parser := (Java classForName: 'stx.libjava.tools.parser.Parser') 
                             new.
                 ].
-                sourceTree := parser parse: unit diet: "true"JavaMethod showFullSource not resolve: false.
+                sourceTree := parser parse: unit diet: true"JavaMethod showFullSource not" resolve: false.
                 sourceLineEnds := parser scanner getLineEnds.
                 self initializeSourceRefsInMethods.
             ].
@@ -376,7 +376,7 @@
     task resume.
 
     "Created: / 06-09-2013 / 17:50:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 26-09-2013 / 00:30:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-10-2013 / 06:40:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaSourceDocument methodsFor:'printing & storing'!
--- a/tools/JavaSourceHighlighter.st	Mon Oct 07 19:16:50 2013 +0100
+++ b/tools/JavaSourceHighlighter.st	Tue Oct 08 07:05:59 2013 +0100
@@ -221,7 +221,7 @@
     preferences isNil ifTrue:[
         preferences := UserPreferences current.
     ].
-    cacheIt := class notNil and:[class isJavaClass].
+    cacheIt := class notNil and:[class theNonMetaclass isJavaClass].
     cacheIt ifTrue:[
         document := JavaSourceDocument cachedDocumentFor: class theNonMetaclass.
         document notNil ifTrue:[
@@ -278,7 +278,7 @@
     ]
 
     "Created: / 04-08-2011 / 23:44:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 04-10-2013 / 11:41:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-10-2013 / 06:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 formatClassDefinition:source in:class elementsInto: els
hg/stx-libjava