Changeset 252

Timestamp:

06/05/07 00:45:11 (2 years ago)

Author:

Ant

Message:

Fixed gotoLine

Files:

• trunk/src/leds/CodeView.d (modified) (3 diffs)
• trunk/src/leds/LanguageD.d (modified) (14 diffs)
• trunk/src/leds/SourceViewEdit.d (modified) (16 diffs)
• trunk/src/leds/Workspace.d (modified) (2 diffs)

trunk/src/leds/CodeView.d

@@ -23 +23 @@
-module leds.CodeView;
-
-//
+
-
-private:
@@ -814 +814 @@
-        debug(saveFile)writefln("CodeView.saveField 1");
-        String text = codeEdit.getText();
-        debug(saveFile)writefln("CodeView.saveField 1 text:\n%s",text);
-        
-        buf.write(text.toString());
+        debug(saveFile)writefln("CodeView.saveField 2 written to buffer");
-        try
-        {
-            FileBuffer.write(fileName,cast(byte[])buf.toBytes());
+            debug(saveFile)writefln("CodeView.saveField 2 written to file");
-            modifiedTime = getFileMTime(fileName);
-            codeEdit.setSavePoint();
+            debug(saveFile)writefln("CodeView.saveField 3");
-            if ( project !is null && getLanguage() == Language.LangType.D )
-            {
+                debug(saveFile)writefln("CodeView.saveField 4");
-                project.setNeedsRecompile(true);
+                debug(saveFile)writefln("CodeView.saveField 5");
-            }
-            needsSave = false;
+            debug(saveFile)writefln("CodeView.saveField 6");
-            workspace.refreshFileViewLabel(this);
+            debug(saveFile)writefln("CodeView.saveField 7");
-        }
-        catch ( FileException fe )
@@ -846 +852 @@
-            workspace.saveAs(this, new String("Error! Please enter file name"));
-        }
-
+
+
+
-            this.getLanguageHandler().checkSyntax();
+            debug(saveFile)writefln("CodeView.saveField 9");
-            setBrowserView(text);
+            debug(saveFile)writefln("CodeView.saveField 10");
-            //missingReturn();
-            setTodos(text);
+            debug(saveFile)writefln("CodeView.saveField 11");
-            workspace.getErrorPane().setTodos(project, todoLines, codeEdit.getLineCount());
+            debug(saveFile)writefln("CodeView.saveField 12");
-            workspace.getErrorPane().setBugs(project, bugLines, codeEdit.getLineCount());
+            debug(saveFile)writefln("CodeView.saveField 13");
-            workspace.getProjectView().setProjectStatus(project);
+            debug(saveFile)writefln("CodeView.saveField 14");
-        }
-        return true;

trunk/src/leds/LanguageD.d

@@ -2 +2 @@
-
-//debug = messages;
-
+
+
-
-import leds.Language;
@@ -544 +545 @@
-    }
-
-    
-    /**
-     * Check the sintax by executing dmd to this file only
-     * @return true if the sintax is correct
-     */
-it
-
-//debug(flow ) System.writefln("CodeView
+ool
+
+debug(flow ) writefln("LanguageD
-        if ( !codeview.getUnitCompile() )
-        {
@@ -557 +557 @@
-        }
-        
-//debug(flow ) System.writefln("CodeView
+debug(flow ) writefln("LanguageD
-        if ( codeview.getProject() is null )
-        {
-            return true;
-        }
-it correct
-//debug(flow ) System.writefln("CodeView
-   
+ool correctSintax
+debug(flow ) writefln("LanguageD
+
-        
-        String phobos = Leds.leds().getPropValue("phobos","/dmd/src/phobos");
@@ -587 +587 @@
-        }
-        
-//debug(flow ) System.writefln("CodeView
+debug(flow ) writefln("LanguageD
-        String[] otherImports = codeview.getProject().getPropValue("importDirs","").splitLines();
-        for ( int i =0 ; i<otherImports.length ; i++ )
@@ -597 +597 @@
-        
-        
-//debug(flow ) System.writefln("CodeView
+debug(flow ) writefln("LanguageD
-            //String grabOutput = new String();
-            //String grabError = new String();
-//debug(flow ) System.writefln("CodeView
+debug(flow ) writefln("LanguageD
-        
-        auto l = Leds.leds().getPropValue("dmd","dmd");
@@ -623 +623 @@
-        }
-        
+        debug(flow ) writefln("LanguageD.checkSintax 7");
-        String compileCommand = new String(
-                Leds.leds().getPropValue("dmd","dmd")
@@ -635 +636 @@
-         
- 
+        debug(flow ) writefln("LanguageD.checkSintax 8");
-        // show message that we are compiling 
-        codeview.getWorkspace().getSystemConsole.print(
-            "Compile Command: \n" ~  compileCommand.toString() ~ "\n......\n");
-        
+        debug(flow ) writefln("LanguageD.checkSintax 9");
-        // create a thread and wait for it to finish..
-        auto compilethread = new CompilerThread(compileCommand);
-        int id  = compilethread.id;
+        debug(flow ) writefln("LanguageD.checkSintax 10");
-        compilethread.start();
+        debug(flow ) writefln("LanguageD.checkSintax 11");
-        char[] res;
-
-
-
+
+
+
+
-                GtkD.mainIteration();   
-            }
-            res =  getCompileCompleted(id);
-            if (res is null) {
-                continue;
-            }
-            break;
-        }
-        // display the results.
@@ -664 +666 @@
-        checkSyntax( res );
-         
+        debug(flow ) writefln("LanguageD.checkSintax 14");
-        codeview.endSintaxCheck();
-        
-        // is there any reason we bother with this?
-        // otherwise we have to hang on for events pending.
-
+
+
-    }
-
@@ -715 +719 @@
-            
-            writefln("completed %s", spawn.getOutputString());
-LanguageD.
+
-            return 1;
-        }
@@ -724 +728 @@
- 
-
-it
+ool
-    {
-        foreach ( String line ; (new String(grabOutput)).splitLines() )
@@ -1220 +1224 @@
-        //Struct container = cast(Struct)mod.getContainerForLine(functionLine);
-        //if ( container !is null )
-CodeView
+LanguageD
-
-        Module thisModule = this.getCachedModule();
@@ -1229 +1233 @@
-        
-     
-CodeView
+LanguageD
-        insertPos = codeview.getCodeEdit().getLineEndPosition(currLine);
-        int count = 0;
@@ -1236 +1240 @@
-        foreach ( e ; container.args) {
-            Definition par = cast(Definition) e;
-CodeView
+LanguageD
-            if ( Leds.leds.getPropValue("ddocComments", false) )
-            {
@@ -1261 +1265 @@
-            return;
-        }
-CodeView
+LanguageD
-        
-        if ( Leds.leds.getPropValue("ddocComments", false) )

trunk/src/leds/SourceViewEdit.d

@@ -80 +80 @@
-    alias CharacterT!(char) Character;
-    
-
-
-
-
+//
+//
+//
+//
-    
-    static void loadLanguages()
@@ -122 +122 @@
-        if ( dLang !is null )
-        {
-
+debug(flow)
-            buffer.setLanguage(dLang);
-            buffer.setHighlight(true);
@@ -135 +135 @@
-        view.setTabsWidth(4);
-        
-
+debug(flow)
-        
-        Pixbuf pixbuf = new Pixbuf(Pixmaps.closeInactive_xpm);
@@ -177 +177 @@
-    void addOnUpdateUI(bit delegate() dlg)
-    {
-writefln("SimpleCode
+debug(flow)writefln("SourceView
-        if ( ! updateUISignals )
-        {
@@ -189 +189 @@
-    void moveCursor(MovementStep step, gint arg2, int arg3, TextView view)
-    {
-
+debug(flow)
-        callUIListeners();
-    }
@@ -195 +195 @@
-    void changed(TextBuffer textBuffer)
-    {
-writefln("SimpleCode
+debug(flow)writefln("SourceView
-        callUIListeners();
-    }
@@ -201 +201 @@
-    void callUIListeners()
-    {
-
+debug(flow)
-        foreach(bit delegate() dlg; updateUIListeners)
-        {
@@ -227 +227 @@
-    int keyPressed(GdkEventKey* event, Widget widget)
-    {
-
+debug(flow)
-        bit processed = false;
-
+debug(flow)
-        switch ( event.state )
-        {
@@ -373 +373 @@
-    {
-        insertIter();
-impleCode
+ourceView
-        return iter.getLine();
-    }
@@ -398 +398 @@
-            iter.setOffset(iter.getOffset()-1);
-        }
-impleCode
+ourceView
-        return new String(buffer.getText(iter1, iter, true));
-    }
@@ -409 +409 @@
-    {
-        insertIter();
-impleCode
+ourceView
-        return getLineText(iter.getLine());
-    }
@@ -532 +532 @@
-    {
-        buffer.getSelectionBounds(iter, iter1);
-impleCode
+ourceView
-        return new String(buffer.getText(iter, iter1, true));
-    }
@@ -598 +598 @@
-        buffer.getEndIter(iter1);
-        ListSG list = buffer.getMarkersInRegion(iter, iter1);
-
-
-
-
+
+
+
+
+
+
+
-        }
-        
@@ -731 +734 @@
-    {
-        iter.setLine(lineNumber);
-//
+
-        view.scrollToIter(iter, 0.0, true, 0.0, 0.25);
-    }
@@ -796 +799 @@
-    {
-        iter.setOffset(position);
-impleCode
-impleCode
-impleCode
+ourceView
+ourceView
+ourceView
-        if ( iter.getOffset() != position )
-        {
-            return '\0';
-        }
-impleCode
+ourceView
-        return iter.getChar();
-    }
@@ -814 +817 @@
-    {
-        iter.setOffset(position);
-impleCode
+ourceView
-        return iter.getLine();
-    }

trunk/src/leds/Workspace.d

@@ -2030 +2030 @@
-        {
-            fileView = dockCode.getCurrentFileView();
+            if ( cast(CodeView)fileView )
+            {
+                (cast(CodeView)fileView).grabFocus();
+            } 
-        }
-        else
@@ -2055 +2059 @@
-            }
-            bringToFront(filename);
+            if ( cast(CodeView)fileView )
+            {
+                (cast(CodeView)fileView).grabFocus();
+            } 
-        }
-        return fileView;