Changeset 291

Timestamp:

07/10/11 08:17:24 (11 months ago)

Author:

Kuan Hsu

Message:

Fixed jump_to_defintion and mousedwell doesn't work in "with" block

Files:

• tags/debug/debug_00.jpg (added)
• tags/newproject (added)
• tags/newproject/Thumbs.db (added)
• tags/newproject/newproject01.jpg (added)
• tags/newproject/newproject02.jpg (added)
• tags/newproject/newproject03.jpg (added)
• tags/newproject/newproject04.jpg (added)
• tags/newproject/newproject05.jpg (added)
• tags/newproject/newproject06.jpg (added)
• tags/newproject/newproject07.jpg (added)
• tags/newproject/newproject08.jpg (added)
• tags/newproject/newproject09.jpg (added)
• tags/newproject/newproject10.jpg (added)
• tags/newproject/newproject20.jpg (added)
• tags/newproject/newproject21.jpg (added)
• trunk/current/poseidon/poseidon.exe (modified) (previous)
• trunk/current/poseidon/poseidon/globals.d (modified) (1 diff)
• trunk/current/poseidon/poseidon/style/dstyle.d (modified) (5 diffs)

trunk/current/poseidon/poseidon/globals.d

@@ -21 +21 @@
-    private import CodeAnalyzer.syntax.nodeHsu;
-
-0
+1
-    
-    static public boolean showSplash = true;

trunk/current/poseidon/poseidon/style/dstyle.d

@@ -564 +564 @@
-
-            originalFunctionNode = functionHeadNode;
-
-
+
+
+
+
+
+
-
-            // Remove Template Parameters Associative arrays
@@ -3000 +3004 @@
-            while( semiChar != ';' &&  semiChar != '}' && semiChar != '{' )
-            {
-
+
+
+
+
+
+
+
+
+
+
+
-                {
-                    if( types != 0 )  
@@ -3017 +3031 @@
-                    if( --semiPos < 0 ) break;
-            }
+            // sGUI.outputPanel.appendLine( "semiWord: " ~ semiWord );
-
-            char[][] splitSemiWord = splitBySpace( semiWord );
@@ -4013 +4028 @@
-            }
-            
-        
-            CAnalyzerTreeNode easyNode = performAnalyzer( currentWords, typedWord, functionHeadNode, listToolTip, bFunctionToolTip, true );
-            if( easyNode !is null )
@@ -4029 +4043 @@
-                    }
-            }
+            else
+            {
+                // modified when in "with" block, currentword not with element but global element
+                if( withName.length )
+                {
+                    easyNode = performAnalyzer( currentWords[1..length], typedWord, functionHeadNode, listToolTip, bFunctionToolTip, true );
+                    if( easyNode !is null )
+                    {
+                        resultNode = easyNode;
+                        lineNum = easyNode.lineNumber;
+                        while( !( easyNode.DType & D_MAINROOT ) )
+                            easyNode = easyNode.getRoot;
+
+                        if( easyNode.getLeafCount )
+                            if( easyNode.getLeaf( 0 ).DType & D_MODULE )
+                            {
+                                fileFullPath =  easyNode.getLeaf( 0 ).typeIdentifier;
+                                moduleName = easyNode.getLeaf( 0 ).identifier;
+                            }
+                    }
+                }
+            }
-        }
-        else