Fixes for Java completion (for both Java/Groovy and Smalltalk)
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 07 Oct 2013 19:21:53 +0100
changeset 127 98c615301608
parent 126 b6468af34fa5
child 128 a98866596a98
Fixes for Java completion (for both Java/Groovy and Smalltalk)
SmallSense__MethodPO.st
SmallSense__SmalltalkCompletionEngine.st
SmallSense__SmalltalkInferencer.st
SmallSense__SmalltalkLintAnnotation.st
abbrev.stc
smallsense.rc
--- a/SmallSense__MethodPO.st	Mon Oct 07 11:33:25 2013 +0100
+++ b/SmallSense__MethodPO.st	Mon Oct 07 19:21:53 2013 +0100
@@ -44,7 +44,7 @@
     stringToComplete := self stringToCompleteForLanguage: language.
     language  isSmalltalk  ifTrue:[
         idx := stringToComplete indexOf: $:.
-        ^idx == 0 ifTrue:[stringToComplete size + 1] ifFalse:[idx + 1].
+        ^idx == 0 ifTrue:[stringToComplete size] ifFalse:[idx].
     ].
     ((language askFor: #isJava) or:[language askFor: #isGroovy]) ifTrue:[
         ^ (stringToComplete at: stringToComplete size - 1) isSeparator
@@ -55,7 +55,7 @@
     ^ stringToComplete size + 1.
 
     "Created: / 03-10-2013 / 16:50:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 04-10-2013 / 08:55:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-10-2013 / 12:30:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 label
--- a/SmallSense__SmalltalkCompletionEngine.st	Mon Oct 07 11:33:25 2013 +0100
+++ b/SmallSense__SmalltalkCompletionEngine.st	Mon Oct 07 19:21:53 2013 +0100
@@ -300,7 +300,7 @@
 
         lineNr := 1.
         colNr := colNrArg.
-        line := codeView list at: lineNrArg.
+        line := codeView list at: lineNrArg ifAbsent:[ nil ].
         line isEmptyOrNil ifTrue:[ ^ nil ].
         inferencer := SmalltalkInferencer forExpression: line.
     ].
@@ -313,7 +313,7 @@
         collector:inferencer
 
     "Created: / 02-10-2013 / 13:23:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 04-10-2013 / 09:31:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-10-2013 / 13:43:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 completeAfter:node
--- a/SmallSense__SmalltalkInferencer.st	Mon Oct 07 11:33:25 2013 +0100
+++ b/SmallSense__SmalltalkInferencer.st	Mon Oct 07 19:21:53 2013 +0100
@@ -497,6 +497,11 @@
 
         class := Smalltalk at: anObject name asSymbol.
         "/ Special hack for JAVA - its actually a JavaPackage...
+        class isBehavior ifFalse:[
+            "/ Actually a global variable...
+            class := class class.
+        ].
+
         class == JAVA ifTrue:[
             class := JavaPackage
         ].
@@ -513,7 +518,7 @@
     ].
 
     "Created: / 26-11-2011 / 13:31:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 05-10-2013 / 00:38:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-10-2013 / 12:29:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !SmalltalkInferencer::Phase2 methodsFor:'processing'!
--- a/SmallSense__SmalltalkLintAnnotation.st	Mon Oct 07 11:33:25 2013 +0100
+++ b/SmallSense__SmalltalkLintAnnotation.st	Mon Oct 07 19:21:53 2013 +0100
@@ -127,3 +127,10 @@
     ^ (self < aMagnitude) not
 ! !
 
+!SmalltalkLintAnnotation class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
--- a/abbrev.stc	Mon Oct 07 11:33:25 2013 +0100
+++ b/abbrev.stc	Mon Oct 07 19:21:53 2013 +0100
@@ -29,7 +29,7 @@
 SmallSense::SmalltalkLintService SmallSense__SmalltalkLintService jv:smallsense 'SmallSense-Smalltalk-Lint' 0
 SmallSense::SmalltalkParseNodeVisitor SmallSense__SmalltalkParseNodeVisitor jv:smallsense 'SmallSense-Smalltalk' 0
 SmallSense::SmalltalkParser SmallSense__SmalltalkParser jv:smallsense 'SmallSense-Smalltalk' 3
-SmallSense::SmalltalkParserTests SmallSense__SmalltalkParserTests jv:smallsense 'SmallSense-Tests' 0
+SmallSense::SmalltalkParserTests SmallSense__SmalltalkParserTests jv:smallsense 'SmallSense-Tests' 1
 SmallSense::SmalltalkQuickFixer SmallSense__SmalltalkQuickFixer jv:smallsense 'SmallSense-Smalltalk-Lint' 0
 SmallSense::SmalltalkSyntaxHighlighter SmallSense__SmalltalkSyntaxHighlighter jv:smallsense 'SmallSense-Smalltalk' 3
 SmallSense::SmalltalkUnacceptedMethodEnvironment SmallSense__SmalltalkUnacceptedMethodEnvironment jv:smallsense 'SmallSense-Smalltalk-Lint' 0
--- a/smallsense.rc	Mon Oct 07 11:33:25 2013 +0100
+++ b/smallsense.rc	Mon Oct 07 19:21:53 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Fri, 04 Oct 2013 23:39:20 GMT\0"
+      VALUE "ProductDate", "Mon, 07 Oct 2013 18:20:54 GMT\0"
     END
 
   END