Patch, Auto add a semicolon for '{}' auto-complete

[Loaden]

Code Select Expand

Index: src/sdk/cbeditor.cpp

===================================================================

--- src/sdk/cbeditor.cpp (revision 6196)

+++ src/sdk/cbeditor.cpp (working copy)

@@ -414,6 +414,21 @@

            control->GotoPos(pos);
            if (ch == _T('{'))
            {
+                int curLine = control->GetCurrentLine();
+                int keyLine = curLine;
+                wxString text;
+                do
+                {
+                    int keyPos = control->GetLineIndentPosition(keyLine);
+                    int start = control->WordStartPosition(keyPos, true);
+                    int end = control->WordEndPosition(keyPos, true);
+                    text = control->GetTextRange(start, end);
+                }
+                while (text.IsEmpty() && --keyLine);
+
+                if (text == _T("class") || text == _T("struct"))
+                    control->InsertText(control->GetLineEndPosition(curLine), _T(";"));
+
                const wxRegEx reg(_T("^[ \t]*{}[ \t]*"));
                if (reg.Matches(control->GetCurLine()))
                {


Example, this code:

Code Select Expand

class A {|}
class B
{
   |
}

struct A {|}
struct B
{
    |
}


After apply this patch, it's auto changed to:

Code Select Expand

class A {|};
class B
{
   |
};

struct A {|};
struct B
{
    |
};


A semicolon add here: };

[attachment deleted by admin]

[oBFusCATed]

What will happen if I type:

Code Select Expand


{|}
or
{
    |
}


[Loaden]

Sorry, I do not know what you mean.
If not class or struct, then it do nothing.

[Loaden]

Update: support 'enum' keyword
Update2: support 'union' keyword 

Code Select Expand

Index: src/sdk/cbeditor.cpp

===================================================================

--- src/sdk/cbeditor.cpp (revision 6196)

+++ src/sdk/cbeditor.cpp (working copy)

@@ -414,6 +414,21 @@

            control->GotoPos(pos);
            if (ch == _T('{'))
            {
+                int curLine = control->GetCurrentLine();
+                int keyLine = curLine;
+                wxString text;
+                do
+                {
+                    int keyPos = control->GetLineIndentPosition(keyLine);
+                    int start = control->WordStartPosition(keyPos, true);
+                    int end = control->WordEndPosition(keyPos, true);
+                    text = control->GetTextRange(start, end);
+                }
+                while (text.IsEmpty() && --keyLine);
+
+                if (text == _T("class") || text == _T("struct") || text == _T("enum") || text == _T("union"))
+                    control->InsertText(control->GetLineEndPosition(curLine), _T(";"));
+
                const wxRegEx reg(_T("^[ \t]*{}[ \t]*"));
                if (reg.Matches(control->GetCurLine()))
                {


[ptDev]

A small suggestion for your patch: you should also support the "union" keyword.

Wow, that was fast! You guys are great!

[MortenMacFly]

What happens in my whole file looks like:

Code Select Expand

{ | }
???
You don't check for the first line / character in the editor being reached, or am I wrong?!
If so, your code my result in an infinite loop, maybe even in a crash.

[ollydbg]

What happens in my whole file looks like:

Code Select Expand

{ | }
???
You don't check for the first line / character in the editor being reached, or am I wrong?!
If so, your code my result in an infinite loop, maybe even in a crash.

@morten:

Loaden use this for condition below:

Code Select Expand

while (text.IsEmpty() && --keyLine);

Look at the variable: keyLine, when it reaches zero, the loop will break, so, there will never be a infinite loop.

[MortenMacFly]

Loaden use this for condition below:

Code Select Expand

while (text.IsEmpty() && --keyLine);
Look at the variable: keyLine, when it reaches zero, the loop will break, so, there will never be a infinite loop.

Indeed. I missed that. C++ style calculations inside an if/while statement - I don't allow such in my coding style, so I am not used to it.

[thomas]

namespace blah{};  ?

[Loaden]

namespace blah{};  ?

OK, I will fix it!  

[Loaden]

Loaden use this for condition below:

Code Select Expand

while (text.IsEmpty() && --keyLine);
Look at the variable: keyLine, when it reaches zero, the loop will break, so, there will never be a infinite loop.

Indeed. I missed that. C++ style calculations inside an if/while statement - I don't allow such in my coding style, so I am not used to it.

Please test this demo:

Code Select Expand

class A



{
If not use "do/while", when type '{', it can not judge the class type.

[MortenMacFly]

Please test this demo:

Code Select Expand

class A



{
If not use "do/while", when type '{', it can not judge the class type.

??? Strange. I did not apply in my copy yet, but what if you use:

Code Select Expand

               do
               {
                   int keyPos = control->GetLineIndentPosition(keyLine);
                   int start = control->WordStartPosition(keyPos, true);
                   int end = control->WordEndPosition(keyPos, true);
                   text = control->GetTextRange(start, end)
                    text.Trim();
                   --keyLine;
               }
               while ( text.IsEmpty() && (keyLine>0) );

Notice: This is untested.

[ollydbg]

But noone will write this kind of code, search to the previous line is enough.

[Loaden]

??? Strange. I did not apply in my copy yet, but what if you use:

Code Select Expand

               do
               {
                   int keyPos = control->GetLineIndentPosition(keyLine);
                   int start = control->WordStartPosition(keyPos, true);
                   int end = control->WordEndPosition(keyPos, true);
                   text = control->GetTextRange(start, end)
                    text.Trim();
                   --keyLine;
               }
               while ( text.IsEmpty() && (keyLine>0) );

Notice: This is untested.

I test it, but it's not work for 'namespace {' question.
I will check it, and fix this problem.

[oBFusCATed]

But noone will write this kind of code, search to the previous line is enough.

Code Select Expand



class A :
      public B1,
      public B2,
      public B3,
      public B4
{
    |
};


Replace A, B1-4 with very long strings and for sure someone will write such code

Code Select Expand


namespace my
{
}; <--- here the semicolon is not needed!