Changeset 270 for trunk

Timestamp:

03/15/08 18:21:19 (9 months ago)

Author:

Ant

Message:

option -sv (GtkSourceView?) corrections

Files:

• trunk/src/language/d/CodeBlock.d (modified) (3 diffs)
• trunk/src/leds/CodeEdit.d (modified) (1 diff)
• trunk/src/leds/CodeView.d (modified) (50 diffs)
• trunk/src/leds/GotoLineDialog.d (modified) (6 diffs)
• trunk/src/leds/LanguageD.d (modified) (1 diff)
• trunk/src/leds/Leds.d (modified) (2 diffs)
• trunk/src/leds/ProjectTarget.d (modified) (1 diff)
• trunk/src/leds/Scintilla.d (modified) (1 diff)
• trunk/src/leds/SimpleCodeEdit.d (modified) (3 diffs)
• trunk/src/leds/SourceViewEdit.d (modified) (19 diffs)
• trunk/src/leds/SystemConsole.d (modified) (4 diffs)

trunk/src/language/d/CodeBlock.d

@@ -2 +2 @@
-
-//debug=messages;
+debug=typeElement;
-
-import language.d.Element;
@@ -132 +133 @@
-        debug(messages)writefln("getAutoCompleteList:: foreach on %d elements", elements.length);
-        foreach (e;elements) {
-
+debug(messages)
-            if (cast(Definition)e) {
-                //debug(messages)writefln("testing %s against %s", start,(cast(Definition)e).name);
@@ -355 +356 @@
-    {
-        
-
+debug(messages)
-        if (std.string.find(match,'[') > -1) {
-            return new BaseType(this,match);

trunk/src/leds/CodeEdit.d

@@ -314 +314 @@
-    
-    int lineFromPosition(int position);
+    
+    int getLineAtY(int y);
-    
-    int markerLineFromHandle(int key);

trunk/src/leds/CodeView.d

@@ -20 +20 @@
- * Code folding by Alan Knowles
- */
-
+
-module leds.CodeView;
-
@@ -27 +27 @@
-//debug=autoComments;
-//debug=flow;
+//debug=getFileMTime;
+//debug=elements;
+debug=editKey;
+//debug=editCharAdded;
-
-private:
-
-private import leds.FileView;
-
+
-private import leds.CodeEdit;
-    
@@ -72 +76 @@
-import parser.FormatD; 
-*/
+
+private import leds.SourceViewEdit;
+
-
-import leds.SystemConsole;
@@ -106 +113 @@
-private import language.d.Directory;
-private import language.d.CodeBlock;
-
+
-
-/**
@@ -153 +160 @@
-    CodeEdit codeEdit;
-
-
+        /// error from the markerHandle
-
-    bool autoIndent = true;
@@ -175 +182 @@
-    
-    String braceCharacters;
+
+    int[][int] lineMarkers; /// makers from the line
+    
-    
-    public:
@@ -191 +201 @@
-        braceCharacters = new String("()[]{}");
-        super(workspace, fileName);
-
+debug(getFileMTime)
-        modifiedTime = getFileMTime(this.fileName);
-
+debug(getFileMTime)
-        this.project = project;
-    
@@ -216 +226 @@
-        codeEdit.setPopupMenu(popupMenu);
-        //codeEdit.addOnExpose(&exposeCallback);
-
+debug(flow)
-    }
-
@@ -265 +275 @@
-        }
-        return language;
+
-    }
-
@@ -343 +354 @@
-                    reloadFile(false);
-                }
-
+       debug(getFileMTime)
-                modifiedTime = getFileMTime(fileName);
-
+       debug(getFileMTime)
-                asking = false;
-            }
@@ -487 +498 @@
-        {
-            reloadFile(false);
-
+   debug(getFileMTime)
-            modifiedTime = getFileMTime(fileName);
-
+   debug(getFileMTime)
-        }
-    }
@@ -516 +527 @@
-        else
-        {
-
+   debug(getFileMTime)
-            modifiedTime = getFileMTime(fileName);
-
+   debug(getFileMTime)
-        }
-    }
@@ -547 +558 @@
-        {
-            input = new String(cast(char[])FileBuffer.read(fileName));
-
+   debug(getFileMTime)
-            modifiedTime = getFileMTime(fileName);
-
+   debug(getFileMTime)
-        }
-        catch ( Exception e)
@@ -582 +593 @@
-    {
-        bool needReload = false;
-
+debug(getFileMTime)
-        if ( modifiedTime != getFileMTime(fileName) )
-        {
-writefln("calling getFileMTime 6
+   debug(getFileMTime)writefln("calling getFileMTime 6.1
-            needReload = PopupBox.yesNo(workspace, 
-                "\""~fileName.toString()~"\"\nwas modified outsize leds!\nReload?",
@@ -592 +603 @@
-            saveFile(fileName);
-        }
-writefln("calling getFileMTime 6
+debug(getFileMTime)writefln("calling getFileMTime 6.2
-        return needReload;
-    }
@@ -605 +616 @@
-    {
-        bool okToModify = true;
-
+debug(getFileMTime)
-        if ( modifiedTime != getFileMTime(fileName) )
-        {
-
+   debug(getFileMTime)
-            okToModify = PopupBox.yesNo(workspace,
-                "\""~fileName.toString()
@@ -614 +625 @@
-                "leds - Light Editor for D");
-        }
-
+debug(getFileMTime)
-        return okToModify;
-    }
@@ -805 +816 @@
-            FileBuffer.write(fileName,cast(byte[])buf.toBytes());
-            debug(saveFile)writefln("CodeView.saveField 2 written to file");
-
+   debug(getFileMTime)
-            modifiedTime = getFileMTime(fileName);
-
+   debug(getFileMTime)
-            codeEdit.setSavePoint();
-            debug(saveFile)writefln("CodeView.saveField 3");
@@ -903 +914 @@
-        errorLines.length = 0;
-        errors = null;
+        lineMarkers = null;
-        if ( project !is null )
-        {
@@ -976 +988 @@
-        errors[markHandle] = message;
-        errorLines ~= lineNumber;
+        int[] markers;
+        if ( lineNumber in lineMarkers )
+        {
+            markers = lineMarkers[lineNumber];
+        }
+        markers ~= markHandle;
+        lineMarkers[lineNumber] = markers;
-        //workspace.restoreBottomPane();
-    }
@@ -1381 +1400 @@
-    body
-    {
-
+debug(elements)
-        if ( elementName is null || elementName.length == 0 )
-        {
-
+   debug(elements)
-            return false;
-        }
-
+debug(elements)
-        Language lang = this.getLanguageHandler();
-
+debug(elements)
-        
-        String[] fileandNum = lang.getElementLocation(elementName, lineNumber);
-
+debug(elements)
-        if (!fileandNum.length) 
-        {
-
+   debug(elements)
-            return false;
-        }
-
+debug(elements)
-        std.stdio.writefln("goto: " ~ fileandNum[0] ~ " :: " ~ fileandNum[1]);
-        int toLine  = atoi(fileandNum[1].toString().ptr);
-        
-
+debug(elements)
-        CodeView cv = cast(CodeView)workspace.openFile(fileandNum[0]);
-        if ( cv is null) 
-        {
-
+   debug(elements)
-            return false;
-        }
-        cv.gotoLine(toLine+1);
-
+debug(elements)
-        return true;
-        
@@ -1589 +1608 @@
-    int mouseButtonPress(GdkEventButton * eventButton, Widget widget)
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (eventButton.button != 1) 
-        {
@@ -1624 +1655 @@
-    void openModule(MenuItem item)
-    {
-
+debug(elements)
-        String token = codeEdit.getSelected();
-        if ( token.length == 0 ) 
@@ -1632 +1663 @@
-        }
-        
-
+debug(elements)
-        String[] fileandNum = getLanguageHandler().getElementLocation(
-                                                    token, codeEdit.getCurrLine());
@@ -1642 +1673 @@
-        CodeBlock container =   sourceModule.getContainerForLine(getLineNumber());
-        
-
+debug(elements)
-        if (!container) 
-        {
-            popupTip("no container found?");
-
+   debug(elements)
-            return;
-        }
@@ -1652 +1683 @@
-        String[] bits = token.split(".");
-        
-
+debug(elements)
-        if (bits.length < 2) 
-        {
-
+   debug(elements)
-            // simple single entity.
-            Element[] types;
@@ -1661 +1692 @@
-            if (types.length > 0 )
-            {
-
+       debug(elements)
-                popupTip(types[0].getHelp());
-//              char[] str = "";
@@ -1673 +1704 @@
-            else
-            {
-
+       debug(elements)
-                popupTip("no types found");
-            }
@@ -1680 +1711 @@
-        else
-        {
-
+debug(elements)
-            Element lookupwith = null;
-            
-            for(int i=0;i< bits.length-1; i++) 
-            {
-
+   debug(elements)
-                Element type = null;
-                if (!lookupwith) 
@@ -1699 +1730 @@
-                {
-                    debug(messages)writefln("cant find defintion of item named %s" , bits[i]);
-
+       debug(elements)
-                    return;
-                }
@@ -1710 +1741 @@
-                {
-                    debug(messages)writefln("cant find defintion of type %s" , type.returnType);
-
+       debug(elements)
-                    return;
-                }
@@ -1721 +1752 @@
-            //debug(messages)writefln("got %d elements", list.length);
-            
-
+debug(elements)
-            if ( !token.length || !cast(CodeBlock)lookupwith ) 
-            { 
@@ -1732 +1763 @@
-                        //codeview.getWorkspace().getSystemConsole.print(de.getHelp());
-                    }
-
+       debug(elements)
-                    return;
-                }
-
+   debug(elements)
-                return;
-            }
@@ -1743 +1774 @@
-            // last item was a '.'
-            
-
+debug(elements)
-            if ( types ) 
-            {
-
+   debug(elements)
-                char[] str = "";
-                foreach( type ; types ) 
@@ -1761 +1792 @@
-        if ( fileandNum.length == 0) 
-        {
-
+debug(elements)
-            return false;
-        }
@@ -2086 +2117 @@
-    public String getLeftRight(String text, int pos, int direction, String extraChars=null)
-    {
+        //writefln("getLeftRight entry");
-        String id;
-        int start = pos + ((direction <0) ?  - 1 : 0);
-        char c = '\0';
+        //writefln("getLeftRight 1");
-     
-        while (
@@ -2101 +2134 @@
-        )
-        {
+            //writefln("getLeftRight 2");
-            start += direction;
-        }
-
-
-
+
+
+
+
+
-            
-            return direction > 0 ? text[pos..start]: text[start+1..pos];
-        }
+        //writefln("getLeftRight exit");
-        
-        return new String();
@@ -2162 +2199 @@
-    bool userShortCuts()
-    {
+        writefln("userShortCuts entry");
-        bool processed = false;
+        writefln("userShortCuts 1");
-        int pos = codeEdit.getCurrentPos();
+        writefln("userShortCuts 2");
-        String stringPrint = new String();
+        writefln("userShortCuts 3");
-        String leftID = getLeftId(new String("?"));
+        writefln("userShortCuts 4");
-
-        if ( leftID.endsWith("?s") )
@@ -2233 +2275 @@
-            }
-        }
+        writefln("userShortCuts entry processed = %s", processed);
-        return processed;
-    }
@@ -2381 +2424 @@
-    }
-    
+    
+    
-    /**
-     * Looks for the user defined completions and inserts on the current position
@@ -2388 +2433 @@
-    {
-        writefln("CodeView.fireAutoCompletion entry");
-
+
+
+
-            return;
-        }
-
+
+
+
+
-            return;
-        }
-        
+        writefln("CodeView.fireAutoCompletion 4");
-        String start = new String();
-        String[] list = this.getLanguageHandler().getLookupList(start);
-
+
+
+
-            //writefln("Show auto completion?");
+            writefln("CodeView.fireAutoCompletion 6");
-            codeEdit.showAutoCompletion(start.length, list);
-        }
- 
+writefln("CodeView.fireAutoCompletion exit");
-    }
-    
@@ -2829 +2883 @@
-            
-            case ';':
-
+debug(editCharAdded)
-                if ( Leds.leds.getPropValue("smartSemiColon",true) )
-                {
-
+   debug(editCharAdded)
-                    if ( smartSemiColonLine != codeEdit.getCurrLine() )
-                    {
-
+       debug(editCharAdded)
-                        smartSemiColonLine = codeEdit.getCurrLine();
-                        
@@ -2841 +2895 @@
-                        if ( ! line.endsWith(";") )
-                        {
-
+           debug(editCharAdded)
-                            codeEdit.deleteBack();
-                            codeEdit.lineEnd();
@@ -2876 +2930 @@
-    bool editKey(int ch, int modifiers)
-    {
-
+debug(editKey)
-        //printf("CodeView.editKey SCN_MODIFIERS %X\n", modifiers );
-        int chConverted;
@@ -2899 +2953 @@
-    bool editMarginClick(int margin, int position)
-    {
+        writefln("editMarginClick entry");
-        switch ( margin )
-        {
@@ -2924 +2979 @@
-    }
- 
+    /**
+     * new for SourceView - we don't wont to mess with existing scintilla code
+     */
+    bool marginClickMarkersForSourceView(int lineNumber)
+    {
+        lineNumber += 1;
+        writefln("marginClickMarkersForSourceView entry");
+        writefln("marginClickMarkersForSourceView lineNumber = %s",lineNumber);
+        foreach ( int key ; lineMarkers.keys )
+        {
+            writefln("\tmarkerd line = %s", key);
+        }
+        if ( lineNumber in lineMarkers )
+        {
+            writefln("marginClickMarkersForSourceView 1");
+            String[] errorList;
+            String message = new String();
+            int[] markers = lineMarkers[lineNumber];
+            writefln("marginClickMarkersForSourceView 2");
+            if ( markers !is null )
+            {
+                writefln("marginClickMarkersForSourceView 3");
+                foreach ( int m ; markers )
+                {
+                    writefln("marginClickMarkersForSourceView 4");
+                    message ~= "\n" ~ errors[m];
+                    errorList ~= "   " ~ errors[m];
+                }
+                if ( message.length() > 0 )
+                {
+                    //codeEdit.callTipShow(codeEdit.getLinePosition(lineNumber), message);
+                    (cast(SourceViewEdit)codeEdit).showErrorsList(errorList);
+                }
+            }
+        }
+        return false;
+    }
+ 
-    bool marginClickMarkers(int position)
-    {
+        writefln("marginClickMarkers entry");
-        int lineNumber = codeEdit.lineFromPosition(position);
+        writefln("marginClickMarkers lineNumber = %s", lineNumber);
- 
-        bool found = false;
@@ -2935 +3030 @@
-        {
-            int markerLine = codeEdit.markerLineFromHandle(keys[i]);
+            writefln("\tmarkerLine = %s", markerLine);
-            found = lineNumber == markerLine;
-            if ( !found) i++;
@@ -2943 +3039 @@
-            {
-//              workspace.getSystemConsole().append(errors[keys[i]]~"\n");
+                writefln("marginClickMarkers popup %s", errors[keys[i]]);
-                codeEdit.callTipShow(position, errors[keys[i]]);
-            }
@@ -2992 +3089 @@
-    {
-        printf("seems this never gets called============================================\n");
-
+edit
-        return false;
-    }
@@ -3056 +3153 @@
-                }
-                break;
-
+
+
+
+
-            default:
-                processed = false;

trunk/src/leds/GotoLineDialog.d

@@ -26 +26 @@
-private import gtk.Window;
-private import gtk.SpinButton;
+private import gtk.Entry;
-private import gtk.Label;
-private import gtk.TreeView;
@@ -45 +46 @@
-    private:    
-    SpinButton spin;
-
+Button gotoButton;
-    /** the workspace here this dialog belongs */
-    Workspace workspace;
@@ -78 +79 @@
-        this.maxLines = maxLines;
-        spin.setAdjustment(new Adjustment(spin.getValue(), 1, maxLines, 1, 10, 10));
+        spin.grabFocus();
+        spin.selectRegion(0, 20);
-        rangeLabel.setText("goto line [1,"~Str.toString(maxLines)~"]");
-        show();
@@ -136 +139 @@
-        
-        spin = new SpinButton(new Adjustment(1, 1, maxLines, 1, 10, 10),1,0);
-
+
+
+
+
-        rangeLabel = new Label("goto line [1,"~Str.toString(maxLines)~"]");
-        
@@ -144 +150 @@
-        Table table = new Table(1,2,true);
-        
-Button b
-b
+gotoB
+gotoB
-
-
+Button 
-        table.attach(button,1,2,0,1,AttachOptions.EXPAND,AttachOptions.EXPAND,2,2);
-
@@ -159 +165 @@
-        hide();
-    }
+
+    void gotoLineOK(Entry entry)
+    {
+        hide();
+        gotoButton.grabFocus();
+        workspace.gotoLine(spin.getValueAsInt);
+    }
-    
-    void gotoLineOK(Button button)

trunk/src/leds/LanguageD.d

@@ -572 +572 @@
-            phobos.replace("/", "\\");
-        }
+        
+        writefln("phobos is not: %s", phobos);
+        
-        if (phobos.length == 0 || !Path.exists(phobos))
-        {

trunk/src/leds/Leds.d

@@ -21 +21 @@
-
-//debug=startup;
-
-
-version(linux) private import std.c.linux.linux;
@@ -844 +843 @@
-    return leds.exitCode;
-}
+
+public static void mainThreads()
+{
+    gdkThreadsEnter();
+    GtkD.main();
+    gdkThreadsLeave();
+}

trunk/src/leds/ProjectTarget.d

@@ -416 +416 @@
-                    case "versionTags":
-                        target.versionTags ~= getWords(tokens);
-
+//
-                        break;
-                        

trunk/src/leds/Scintilla.d

@@ -2508 +2508 @@
-    }
-    
+    int getLineAtY(int y)
+    {
+        // TODO
+        return 0;
+    }
+    
-    int markerLineFromHandle(int key)
-    {

trunk/src/leds/SimpleCodeEdit.d

@@ -26 +26 @@
-private import gdk.Event;
-private import leds.CodeEdit;
+
+private import gtk.Window;
+private import gtk.Label;
+
-
-private import std.stdio;
@@ -741 +745 @@
-    }
-    
+    int getLineAtY(int y)
+    {
+        int lineTop;
+        view.getLineAtY(iter, y, &lineTop);
+        return lineTop;
+    }
+    
+
+    
-    int markerLineFromHandle(int key)
-    {
@@ -756 +769 @@
-    void callTipShow(int position, String message)
-    {
+        Window window = new Window("");
+        window.add(new Label(message.toString()));
+        window.showAll();
-    }
-    

trunk/src/leds/SourceViewEdit.d

@@ -25 +25 @@
-//{;
-
+
-private import leds.CodeEdit;
-
@@ -33 +34 @@
-private import gsv.SourceView;
-private import gsv.SourceBuffer;
-er
+
-private import gsv.SourceLanguage;
-s
+
-
-private import gsvc.gsvtypes;
@@ -45 +46 @@
-private import gtk.TextIter;
-    
+private import gtk.Window;
+private import gtk.Label;
+
+
-
-private import dool.String;
@@ -59 +64 @@
-private import gtk.Widget;
-
-private import gsv.SourceLanguage;
-private import gsv.SourceLanguagesManager;
-private import glib.ListSG;
-
@@ -67 +70 @@
-
-private import glib.ListSG;
+private import glib.Str;
-
-/**
@@ -89 +93 @@
-    static void loadLanguages()
-    {
-sManager slm = new SourceLanguages
-ListSG list = slm.getAvailableLanguages(
+Manager slm = new SourceLanguage
+char[][] ids = Str.toStringArray(slm.getLanguageIds()
-        
-        //writefln("%s available languages", list.length());
-        
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        
-    }
@@ -126 +124 @@
-            debug(flow)writefln("Setting language to D");
-            buffer.setLanguage(dLang);
-
+Syntax
-        }
-        
-        view.setAutoIndent(true);
-er
+
-        view.setHighlightCurrentLine(true);
-true
-Check
-
-s
+SourceSmartHomeEndType.AFTER
+HighlightMatching
+
+
-        
-        debug(flow)writefln("sourceViewEdit.this exit");
-        
-
-
+
+
+
-        
-    }
@@ -604 +603 @@
-        buffer.getStartIter(iter);
-        buffer.getEndIter(iter1);
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-    
@@ -623 +614 @@
-    {
-        buffer.getIterAtLine(iter, lineNumber);
-er sm = buffer.createMarker("test"
+ sm = buffer.createSourceMark(null
-        return cast(int) cast(void*)sm;
-        //return -1;
@@ -643 +634 @@
-    int getTabWidth()
-    {
-s
+
-    }
-    
@@ -658 +649 @@
-    int getLinePosition(int lineNumber)
-    {
-
+
+
-    }
-    
@@ -740 +732 @@
-    void gotoLine(int lineNumber, bool useAlign=false)
-    {
-
+//
-        insertIter();   // make sure we have a valid iter
-        iter.setLine(lineNumber);
-
+//
-        buffer.placeCursor(iter);
-