The Ecere SDK - sdk/blob - ide/src/designer/CodeEditor.ec

   1 import "ide"
   2
   3 // *** Color Schemes ***
   4
   5 // *** The Old Color Scheme that was causing me auras and ophtalmic migraines -- Uncomment at your own risk! ***
   6 /*
   7 FontResource panelFont { $"Courier New", 10 };
   8 FontResource codeFont { $"Courier New", 10 };
   9 Color selectionColor = Color { 10, 36, 106 };
  10 Color selectionText = white;
  11 Color viewsBackground = white;
  12 Color viewsText = black;
  13 Color outputBackground = white;
  14 Color outputText = black;
  15 Color projectViewBackground = white;
  16 Color projectViewText = black;
  17 Color codeEditorBG = white;
  18 Color codeEditorFG = black;
  19 Color marginColor = Color {230, 230, 230};
  20 Color selectedMarginColor = Color {200, 200, 200};
  21 Color lineNumbersColor = Color {60, 60, 60};
  22 SyntaxColorScheme colorScheme
  23 {
  24    keywordColors = [ blue, blue ];
  25    commentColor = dimGray;
  26    charLiteralColor = crimson;
  27    stringLiteralColor = crimson;
  28    preprocessorColor = green;
  29    numberColor = teal;
  30 };
  31 */
  32
  33 // The new nice dark scheme -- so peaceful on my brain
  34
  35 FontResource panelFont { $"Courier New", 10 };
  36 FontResource codeFont { $"Courier New", 10 };
  37 /*
  38 FontResource panelFont { $"Consolas", 12 };
  39 FontResource codeFont { $"Consolas", 12 };
  40 */
  41 Color selectionColor = lightYellow;
  42 Color selectionText = Color { 30, 40, 50 };
  43 Color viewsBackground = Color { 30, 40, 50 };
  44 Color viewsText = lightGray;
  45 Color outputBackground = black;
  46 Color outputText = lime;
  47 Color projectViewBackground = Color { 30, 40, 50 };
  48 Color projectViewText = lightGray;
  49 Color codeEditorBG = black;
  50 Color codeEditorFG = ivory;
  51 Color marginColor = Color {24, 24, 24};
  52 Color selectedMarginColor = Color {64, 64, 64};
  53 Color lineNumbersColor = Color {160, 160, 160};
  54 SyntaxColorScheme colorScheme
  55 {
  56    keywordColors = [ skyBlue, skyBlue ];
  57    commentColor = Color { 125, 125, 125 };
  58    charLiteralColor = Color { 245, 50, 245 };
  59    stringLiteralColor = Color { 245, 50, 245 };
  60    preprocessorColor = { 120, 220, 140 };
  61    numberColor = Color {   0, 192, 192 };
  62 };
  63
  64 // *********************
  65
  66 import "findCtx"
  67 import "findExp"
  68 import "findParams"
  69
  70 // UNTIL IMPLEMENTED IN GRAMMAR
  71 #define ACCESS_CLASSDATA(_class, baseClass) \
  72    (_class ? ((void *)(((char *)_class.data) + baseClass.offsetClass)) : null)
  73
  74 #ifdef ECERE_STATIC
  75 extern int __attribute__((__stdcall__)) __ecereDll_Load_ecere(struct __ecereNameSpace__ecere__com__Instance * module);
  76 extern int __attribute__((__stdcall__)) __ecereDll_Unload_ecere(struct __ecereNameSpace__ecere__com__Instance * module);
  77 #endif
  78
  79 static Array<FileFilter> fileFilters
  80 { [
  81    { $"C/C++/eC Files (*.ec, *.eh, *.c, *.cpp, *.cc, *.cxx, *.h, *.hpp, *.hh, *.hxx)", "ec, eh, c, cpp, cc, cxx, h, hpp, hh, hxx" },
  82    { $"Header Files for C/C++ (*.eh, *.h, *.hpp, *.hh, *.hxx)", "eh, h, hpp, hh, hxx" },
  83    { $"C/C++/eC Source Files (*.ec, *.c, *.cpp, *.cc, *.cxx)", "ec, c, cpp, cc, cxx" },
  84    { $"Text files (*.txt)", "txt" },
  85    { $"All files", null }
  86 ] };
  87
  88 static Array<FileType> fileTypes
  89 { [
  90    { $"eC Source Code", "ec", whenNoneGiven },
  91    { $"Text Files", "txt", never }
  92 ] };
  93
  94 static char * iconNames[] =
  95 {
  96    "<:ecere>constructs/class.png",
  97    "<:ecere>constructs/data.png",
  98    "<:ecere>constructs/method.png",
  99    "<:ecere>constructs/event.png",
 100    "<:ecere>constructs/property.png",
 101    "<:ecere>constructs/namespace.png",
 102    "<:ecere>constructs/dataType.png",
 103    "<:ecere>constructs/enumValue.png",
 104    "<:ecere>constructs/dataPrivate.png",
 105    "<:ecere>constructs/methodPrivate.png",
 106    "<:ecere>constructs/propertyPrivate.png"
 107 };
 108
 109 enum SheetType { methods, properties };
 110
 111 extern int __ecereVMethodID_class_OnEdit;
 112 extern int __ecereVMethodID_class_OnDisplay;
 113 extern int __ecereVMethodID_class_OnGetString;
 114 extern int __ecereVMethodID_class_OnFree;
 115 extern int __ecereVMethodID_class_OnCompare;
 116 extern int __ecereVMethodID_class_OnCopy;
 117 extern int __ecereVMethodID_class_OnSaveEdit;
 118 extern int __ecereVMethodID___ecereNameSpace__ecere__com__Module_OnLoad;
 119
 120 class RTCMenuBits
 121 {
 122 public:
 123    bool ignoreBreakpoints:1;
 124    bool atSameLevel:1;
 125    bool oldImplementation:1;
 126 };
 127
 128 class EditFileDialog : FileDialog
 129 {
 130    bool OnCreate()
 131    {
 132       if(!ide.projectView && ideSettings.ideFileDialogLocation)
 133          currentDirectory = ideSettings.ideFileDialogLocation;
 134       return FileDialog::OnCreate();
 135    }
 136 }
 137
 138 EditFileDialog codeEditorFileDialog
 139 {
 140    type = multiOpen, text = $"Open",
 141    types = fileTypes.array, sizeTypes = fileTypes.count * sizeof(FileType);
 142    filters = fileFilters.array, sizeFilters = fileFilters.count * sizeof(FileFilter)
 143 };
 144
 145 EditFileDialog codeEditorFormFileDialog
 146 {
 147    type = open, text = $"Open Project",
 148    types = fileTypes.array, sizeTypes = fileTypes.count * sizeof(FileType),
 149    filters = fileFilters.array, sizeFilters = fileFilters.count * sizeof(FileFilter)
 150 };
 151
 152 define OpenBracket = '{';
 153 define CloseBracket = '}';
 154
 155 enum MethodAction
 156 {
 157    actionAddMethod = 1,
 158    actionDeleteMethod = 2,
 159    actionDetachMethod = 3,
 160    actionAttachMethod = 4,
 161    actionReattachMethod = 5
 162 };
 163
 164 //extern StatusField pos, ovr, caps, num;
 165 //extern Class thisClass;
 166
 167 File output;
 168
 169 File fileInput;
 170
 171 bool parseError = false;
 172
 173 int returnCode;
 174
 175 Class insideClass;
 176 Expression ctxInsideExp;
 177 Expression paramsInsideExp;
 178 ClassFunction insideFunction;
 179 ClassDef insideDef;
 180 Type instanceType;
 181 char * instanceName;
 182 Type functionType;
 183 int paramsID;
 184 bool insideInstance;
 185
 186 /****************************************************************************
 187                               GENERATING
 188 ****************************************************************************/
 189
 190 static void OutputString(File f, char * string)
 191 {
 192    int c;
 193    for(c = 0; string[c]; c++)
 194    {
 195       if(string[c] == '\"')
 196          f.Puts("\\\"");
 197       else if(string[c] == '\\')
 198          f.Puts("\\\\");
 199       else
 200          f.Putc(string[c]);
 201    }
 202 }
 203
 204 void OutputType(File f, Type type, bool outputName)
 205 {
 206    if(type)
 207    {
 208       switch(type.kind)
 209       {
 210          case voidType:
 211             f.Printf("void");
 212             break;
 213          case charType:
 214             if(!type.isSigned) f.Printf("unsigned ");
 215             f.Printf("char");
 216             break;
 217          case shortType:
 218             if(!type.isSigned) f.Printf("unsigned ");
 219             f.Printf("short");
 220             break;
 221          case intType:
 222             if(!type.isSigned) f.Printf("unsigned ");
 223             f.Printf("int");
 224             break;
 225          case int64Type:
 226             if(!type.isSigned) f.Printf("unsigned ");
 227             f.Printf("__int64");
 228             break;
 229          case longType:
 230             if(!type.isSigned) f.Printf("unsigned ");
 231             f.Printf("long");
 232             break;
 233          case floatType:
 234             f.Printf("float");
 235             break;
 236          case doubleType:
 237             f.Printf("double");
 238             break;
 239          case classType:
 240          {
 241             if(type._class && !strcmp(type._class.string, "class"))
 242             {
 243                switch(type.classObjectType)
 244                {
 245                   case anyObject:
 246                      f.Printf("any_object");
 247                      break;
 248                   default:
 249                      f.Printf("typed_object");
 250                      break;
 251                }
 252                if(type.byReference)
 253                   f.Printf(" &");
 254             }
 255             else
 256                // ADD CODE TO DECIDE WHETHER TO OUTPUT FULLY QUAlIFIED OR NOT:
 257                f.Printf(type._class.shortName ? type._class.shortName : type._class.string);
 258             break;
 259          }
 260          case structType:
 261             break;
 262          case unionType:
 263             break;
 264          case functionType:
 265             break;
 266          case arrayType:
 267             OutputType(f, type.type, false);
 268             break;
 269          case pointerType:
 270             OutputType(f, type.type, false);
 271             f.Printf(" *");
 272             break;
 273          case ellipsisType:
 274             f.Printf("...");
 275             break;
 276          case enumType:
 277             break;
 278          case methodType:
 279             break;
 280       }
 281       if(outputName)
 282       {
 283          if(type.name)
 284          {
 285             f.Printf(" ");
 286             f.Printf(type.name);
 287          }
 288       }
 289       if(type.kind == arrayType)
 290       {
 291          f.Printf("[");
 292          f.Printf("%d", type.arraySize);
 293          f.Printf("]");
 294       }
 295    }
 296 }
 297
 298 void DeleteJunkBefore(EditBoxStream f, int pos, int * position)
 299 {
 300    char ch;
 301    int before = 0;
 302
 303    if(position)
 304       f.Seek(pos - *position, current);
 305
 306    // Try to delete spaces and \n before...
 307    f.Seek(-1, current);
 308    for(;f.Getc(&ch);)
 309    {
 310       if(!isspace(ch))
 311          break;
 312       /*else if(ch == '\n')
 313       {
 314          // Look for // comments on the line before
 315          EditBox editBox = f.editBox;
 316          EditLine line = editBox.line;
 317          char * text;
 318          char last = 0;
 319          int c;
 320          bool quoted = false;
 321          line = line.prev;
 322          text = line.text;
 323          for(c = 0; text[c]; c++)
 324          {
 325             if(text[c] == '"')
 326             {
 327                quoted ^= true;
 328                last = 0;
 329             }
 330             else if(!quoted)
 331             {
 332                if(text[c] == '/' && last == '/')
 333                   break;
 334                last = text[c];
 335             }
 336          }
 337          if(text[c])
 338             break;
 339       }*/
 340       before++;
 341       f.Seek(-2, current);
 342    }
 343
 344    f.DeleteBytes(before);
 345    if(position)
 346       *position = pos;
 347 }
 348
 349 void GetLocText(EditBox editBox, File f, int position, Location loc, char ** text, int * size, int pad, int linePad)
 350 {
 351    EditLine l1, l2;
 352    int y1,x1, y2,x2;
 353
 354    editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
 355
 356    // Cut & Paste function
 357
 358    {
 359       EditLine l1, l2;
 360       int y1,x1,y2,x2;
 361
 362       f.Seek(loc.start.pos - position, current);
 363       l1 = editBox.line;
 364       x1 = editBox.charPos;
 365       y1 = editBox.lineNumber;
 366       f.Seek(loc.end.pos - loc.start.pos, current);
 367       l2 = editBox.line;
 368       x2 = editBox.charPos;
 369       y2 = editBox.lineNumber;
 370       editBox.SetSelPos(l1, y1, x1, l2, y2, x2);
 371
 372       *size = editBox.SelSize();
 373       *text = new char[*size+1 + (y2-y1+1) * linePad + pad]; // Add pad for tabs and new name
 374       editBox.GetSel(*text, false);
 375    }
 376
 377    editBox.SetSelPos(l1, y1, x1, l2, y2, x2);
 378    f.Printf(""); // Make the stream point to where the editbox is
 379 }
 380
 381 void Code_FixProperty(Property prop, Instance object)
 382 {
 383    Designer::FixProperty(prop, object);
 384 }
 385
 386 bool Code_IsPropertyModified(Instance test, ObjectInfo selected, Property prop)
 387 {
 388    bool result = false;
 389    if(prop.dataTypeString && (!prop.IsSet || prop.IsSet(selected.instance)))
 390    {
 391       Class dataType = prop.dataTypeClass;
 392
 393       if(!dataType)
 394          dataType = prop.dataTypeClass = eSystem_FindClass(test._class.module, prop.dataTypeString);
 395
 396       if(dataType && dataType._vTbl && dataType.type == structClass)
 397       {
 398          void * dataForm = new0 byte[dataType.structSize];
 399          void * dataTest = new0 byte[dataType.structSize];
 400
 401          ((void (*)(void *, void *))(void *)prop.Get)(selected.instance, dataForm);
 402          ((void (*)(void *, void *))(void *)prop.Get)(test, dataTest);
 403
 404          if((prop.IsSet && !prop.IsSet(test)) || ((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, dataForm, dataTest))
 405          {
 406             ((void (*)(void *, void *))(void *)prop.Set)(test, dataForm);
 407             result = true;
 408          }
 409          delete dataForm;
 410          delete dataTest;
 411       }
 412       else if(dataType && dataType._vTbl && (dataType.type == normalClass || dataType.type == noHeadClass))
 413       {
 414          void * dataForm, * dataTest;
 415
 416          dataForm = ((void *(*)(void *))(void *)prop.Get)(selected.instance);
 417          dataTest = ((void *(*)(void *))(void *)prop.Get)(test);
 418
 419          if((prop.IsSet && !prop.IsSet(test)) || ((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, dataForm, dataTest))
 420          {
 421             ((void (*)(void *, void *))(void *)prop.Set)(test, dataForm);
 422             result = true;
 423          }
 424       }
 425       else if(dataType && dataType._vTbl)
 426       {
 427          DataValue dataForm, dataTest;
 428
 429          GetProperty(prop, selected.instance, &dataForm);
 430          GetProperty(prop, test, &dataTest);
 431
 432          if((prop.IsSet && !prop.IsSet(test)) || ((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, &dataForm, &dataTest))
 433          {
 434             SetProperty(prop, test, dataForm);
 435
 436             // In case setting on test unset on real instance (e.g. isDefault)
 437             if(strcmp(prop.name, "name"))
 438             {
 439                GetProperty(prop, selected.instance, &dataTest);
 440                if(((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, &dataForm, &dataTest))
 441                   SetProperty(prop, selected.instance, dataForm);
 442             }
 443             result = true;
 444          }
 445       }
 446    }
 447    return result;
 448 }
 449
 450 bool Code_IsPropertyDisabled(ObjectInfo selected, char * name)
 451 {
 452    bool disabled = false;
 453    if(selected.oClass == selected)
 454    {
 455       ClassDef def;
 456       if(selected.classDefinition)
 457       {
 458          for(def = selected.classDefinition.definitions->first; def; def = def.next)
 459          {
 460             if(def.type == defaultPropertiesClassDef)
 461             {
 462                MemberInit prop;
 463                for(prop = def.defProperties->first; prop; prop = prop.next)
 464                {
 465                   if(prop.identifiers && prop.identifiers->first)
 466                   {
 467                      Identifier id = prop.identifiers->first;
 468                      if(prop.variable && !strcmp(id.string, name))
 469                      {
 470                         disabled = true;
 471                         break;
 472                      }
 473                   }
 474                }
 475             }
 476             if(disabled) break;
 477          }
 478       }
 479    }
 480    else if(selected.instCode)
 481    {
 482       MembersInit members;
 483       if(selected.instCode.members)
 484       {
 485          for(members = selected.instCode.members->first; members; members = members.next)
 486          {
 487             if(members.type == dataMembersInit && members.dataMembers)
 488             {
 489                MemberInit prop;
 490                for(prop = members.dataMembers->first; prop; prop = prop.next)
 491                {
 492                   if(prop.identifiers && prop.identifiers->first)
 493                   {
 494                      Identifier id = prop.identifiers->first;
 495                      if(prop.variable && !strcmp(id.string, name))
 496                      {
 497                         disabled = true;
 498                         break;
 499                      }
 500                   }
 501                }
 502             }
 503             if(disabled) break;
 504          }
 505       }
 506    }
 507    return disabled;
 508 }
 509
 510 static bool CheckCompatibleMethod(Method method, Type type, Class regClass, bool isForm, Symbol selectedClass)
 511 {
 512    bool result = false;
 513    bool reset = false;
 514    if(!method.dataType)
 515       method.dataType = ProcessTypeString(method.dataTypeString, false);
 516    if(!method.dataType.thisClass && !isForm)
 517    {
 518       reset = true;
 519       method.dataType.thisClass = selectedClass;
 520    }
 521    //result = MatchTypes(method.dataType, type, null, regClass, regClass, false);
 522    result = MatchTypes(type, method.dataType, null, regClass, regClass, false, true, true, false);
 523    if(reset)
 524       method.dataType.thisClass = null;
 525    return result;
 526 }
 527
 528 bool Code_IsFunctionEmpty(ClassFunction function, Method method, ObjectInfo object)
 529 {
 530    bool confirmation = true;
 531    Statement body = function.body;
 532    // Check if it contains any code
 533    if((!body.compound.declarations || !body.compound.declarations->count) && (!body.compound.statements || body.compound.statements->count <= 1))
 534    {
 535       Class moduleClass = eSystem_FindClass(object.instance._class.module, "Module");
 536       Statement stmt = body.compound.statements ? body.compound.statements->first : null;
 537       Type dataType = method.dataType;
 538       Type returnType = dataType.returnType;
 539       Expression exp = null;
 540
 541       if(!method.dataType)
 542          method.dataType = ProcessTypeString(method.dataTypeString, false);
 543
 544       confirmation = false;
 545
 546       // Check if default function should be calling base class:
 547       if(object.instance._class._vTbl[method.vid] == moduleClass._vTbl[__ecereVMethodID___ecereNameSpace__ecere__com__Module_OnLoad]) // Temp Check for DefaultFunction
 548       {
 549          if(returnType.kind != voidType)
 550          {
 551             if(!stmt || stmt.type != returnStmt || !stmt.expressions || stmt.expressions->count != 1)
 552                confirmation = true;
 553             else
 554             {
 555                exp = stmt.expressions->first;
 556                if(returnType.kind == classType && !strcmp(returnType._class.string, "bool"))
 557                {
 558                   if( (exp.type != identifierExp || strcmp(exp.identifier.string, "true")) &&
 559                       (exp.type != constantExp || strcmp(exp.constant, "1")))
 560                      confirmation = true;
 561                }
 562                else
 563                {
 564                   if(exp.type != constantExp || strcmp(exp.constant, "0"))
 565                      confirmation = true;
 566                }
 567             }
 568          }
 569          else
 570          {
 571             if(stmt)
 572                confirmation = true;
 573          }
 574       }
 575       else
 576       {
 577          if(stmt)
 578          {
 579             if(returnType.kind != voidType)
 580             {
 581                if(stmt.type == returnStmt && stmt.expressions && stmt.expressions->count == 1)
 582                   exp = stmt.expressions->first;
 583             }
 584             else if(stmt.type == expressionStmt && stmt.expressions && stmt.expressions->count == 1)
 585                exp = stmt.expressions->first;
 586          }
 587
 588          if(!exp || exp.type != callExp || exp.call.exp.type != identifierExp)
 589             confirmation = true;
 590          else
 591          {
 592             Identifier id = exp.call.exp.identifier;
 593             Class base = object.instance._class;
 594             if(!id._class || (id._class.name && !strcmp(id._class.name, base.name)) || strcmp(id.string, method.name))
 595                confirmation = true;
 596             else
 597             {
 598                Expression arg = exp.call.arguments ? exp.call.arguments->first : null;
 599                if(!arg || arg.type != identifierExp || strcmp("this", arg.identifier.string))
 600                   confirmation = true;
 601                else
 602                {
 603                   Type param;
 604                   arg = arg.next;
 605                   for(param = dataType.params.first; param; param = param.next)
 606                   {
 607                      if(!arg || arg.type != identifierExp || strcmp(param.name, arg.identifier.string))
 608                      {
 609                         confirmation = true;
 610                         break;
 611                      }
 612                      arg = arg ?arg.next : null;
 613                   }
 614                }
 615             }
 616          }
 617       }
 618    }
 619    return !confirmation;
 620 }
 621
 622 class CodeEditor : Window
 623 {
 624    background = marginColor;
 625    borderStyle = sizableDeep;
 626    hasMaximize = true;
 627    hasMinimize = true;
 628    hasClose = true;
 629    isDocument = true;
 630    isActiveClient = true;
 631    anchor = Anchor { left = 300, right = 150, top = 0, bottom = 0 };
 632    menu = Menu { };
 633
 634    // eWindow_SetX(A_CASCADE); eWindow_SetY(A_CASCADE);
 635    // eWindow_SetWidth(A_RELATIVE|80); eWindow_SetHeight(A_RELATIVE|80);
 636
 637    SheetType sheetSelected;
 638    ToolBox toolBox;
 639    Sheet sheet;
 640
 641    OldList * ast;
 642    Context globalContext { };
 643    OldList excludedSymbols { offset = (uint)&((Symbol)0).left };
 644
 645    OldList defines;
 646    OldList imports;
 647
 648    OldList classes;
 649    bool codeModified;
 650    bool formModified;
 651
 652    ObjectInfo selected;
 653    ObjectInfo oClass;
 654
 655    // Methods Editing:
 656    MethodAction methodAction;
 657    Method method;
 658    ClassFunction function;
 659    bool moveAttached;
 660    char methodName[1024];
 661
 662    bool updatingCode;
 663    bool loadingFile;
 664    bool fixCaret;
 665    bool membersListShown;
 666    bool membersAbove;
 667    Location membersLoc;
 668    EditLine membersLine;
 669
 670    Type functionType, instanceType;
 671    int paramsID;
 672    bool paramsShown;
 673    bool paramsAbove;
 674    Point paramsPosition;
 675    Expression functionExp;
 676    bool expectingMove;
 677
 678    BitmapResource icons[CodeObjectType];
 679
 680    FontResource boldFont { $"Tahoma", 8.25f, bold = true, window = this };
 681    FontResource normalFont { $"Tahoma", 8.25f, window = this };
 682
 683    Module privateModule;
 684    NameSpace globalData;
 685    bool skipModified;
 686    bool inUseDebug;
 687    OpenedFileInfo openedFileInfo;
 688
 689    FontResource font { codeFont.faceName, codeFont.size };
 690    saveDialog = codeEditorFileDialog;
 691
 692    Designer designer { codeEditor = this, visible = false, saveDialog = codeEditorFormFileDialog };
 693
 694    bool noParsing;
 695    int maxLineNumberLength;
 696
 697    property bool parsing { get { return editBox.syntaxHighlighting && !noParsing && !ide.noParsing; } };
 698
 699    void ProcessCaretMove(EditBox editBox, int line, int charPos)
 700    {
 701       char temp[512];
 702       ObjectInfo classItem;
 703
 704       // OnActivateClient is called after OnActivate
 705       if(!updatingCode)
 706       {
 707          sprintf(temp, $"Ln %d, Col %d", line, editBox.column + 1);
 708          ide.pos.text = temp;
 709       }
 710       if(sheet.codeEditor != this) return;
 711
 712       if(!updatingCode)
 713       {
 714          for(classItem = classes.first; classItem; classItem = classItem.next)
 715          {
 716             ClassDefinition classDef = classItem.classDefinition;
 717             if(classDef && classDef.loc.Inside(line, charPos))
 718                break;
 719          }
 720
 721          if(classItem)
 722          {
 723             ObjectInfo object;
 724             for(object = classItem.instances.first; object; object = object.next)
 725             {
 726                if(object.instCode)
 727                {
 728                   if(object.instCode.loc.Inside(line, charPos))
 729                      break;
 730                }
 731             }
 732             if(object)
 733                sheet.SelectObject(object);
 734             else
 735                sheet.SelectObject(classItem);
 736             Update(null);
 737          }
 738          //else
 739          {
 740             //sheet.SelectObject(null);
 741             //Update(null);
 742          }
 743
 744          sprintf(temp, $"Ln %d, Col %d", line, editBox.column + 1);
 745          ide.pos.text = temp;
 746
 747          if(expectingMove)
 748             expectingMove = false;
 749          else
 750          {
 751             if(membersListShown)
 752             {
 753                bool hide = false;
 754                if(line-1 != membersLoc.start.line)
 755                   hide = true;
 756                else
 757                {
 758                   char * buffer = membersLine.text;
 759                   int c;
 760
 761                   if(charPos - 1 < membersLoc.start.charPos)
 762                      hide = true;
 763                   else if(charPos - 1 > membersLoc.end.charPos)
 764                   {
 765                      char * buffer = membersLine.text;
 766                      //if(membersList.currentRow)
 767                      //   hide = true;
 768                      //else
 769                      {
 770                         for(c = membersLoc.start.charPos; c<=charPos && buffer[c]; c++)
 771                            if(buffer[c] != ' ' && buffer[c] != '\t')
 772                               break;
 773                         if(c < charPos && buffer[c])
 774                            hide = true;
 775                      }
 776                   }
 777                }
 778                if(hide)
 779                {
 780                   membersList.Destroy(0);
 781                   membersListShown = false;
 782                }
 783             }
 784             {
 785                bool back = codeModified;
 786                codeModified = false;
 787                if(paramsShown)
 788                   InvokeParameters(false, false, false);
 789                /*if(membersListShown)
 790                   InvokeAutoComplete(false, 0, true);*/
 791                codeModified = back;
 792             }
 793          }
 794       }
 795    }
 796
 797    watch(modifiedDocument)
 798    {
 799       ProjectView projectView = ide.projectView;
 800       if(projectView)
 801       {
 802          char buffer[MAX_LOCATION];
 803          char * fullPath = GetSlashPathBuffer(buffer, fileName);
 804          Array<ProjectNode> nodes = ide.workspace.GetAllProjectNodes(fullPath, false);
 805          if(nodes)
 806          {
 807             for(node : nodes)
 808                node.modified = modifiedDocument;
 809             projectView.Update(null);
 810          }
 811          delete nodes;
 812       }
 813    };
 814
 815
 816    EditBox editBox
 817    {
 818       textVertScroll = true, multiLine = true, /*lineNumbers = ideSettings.showLineNumbers,*/
 819       freeCaret = ideSettings.useFreeCaret, caretFollowsScrolling = ideSettings.caretFollowsScrolling,
 820       tabKey = true, smartHome = true;
 821       tabSelection = true, /*maxLineSize = 65536, */parent = this, hasHorzScroll = true, hasVertScroll = true;
 822       selectionColor = selectionColor, selectionText = selectionText,
 823       background = codeEditorBG, foreground = codeEditorFG, syntaxColorScheme = colorScheme,
 824       font = font, borderStyle = none;
 825       anchor = Anchor { left = 0, right = 0, top = 0, bottom = 0 };
 826
 827       bool OnMouseOver(int x, int y, Modifiers mods)
 828       {
 829          CodeEditor editor = (CodeEditor)master;
 830          if(editor.designer && editor.designer.isDragging && !mods.isSideEffect)
 831             Activate();
 832          return true;
 833       }
 834
 835       void NotifyCaretMove(EditBox editBox, int line, int charPos)
 836       {
 837          // Update Line Numbers
 838          int spaceH;
 839          int oldLine = lastLine;
 840          display.FontExtent(font.font, " ", 1, null, &spaceH);
 841          {
 842             Box box { 0, (Min(oldLine,oldLine)-1) * spaceH - editBox.scroll.y, editBox.anchor.left.distance, (Max(oldLine, oldLine))*spaceH-1 - editBox.scroll.y };
 843             Update(box);
 844          }
 845          {
 846             Box box { 0, (Min(line,line)-1) * spaceH - editBox.scroll.y, editBox.anchor.left.distance, (Max(line, line))*spaceH-1 - editBox.scroll.y };
 847             Update(box);
 848          }
 849          lastLine = line;
 850
 851          if(ide.activeClient == this)
 852             ProcessCaretMove(editBox, line, charPos);
 853          if(openedFileInfo)
 854             openedFileInfo.CaretMove(line, charPos);
 855       }
 856
 857       void NotifyOvrToggle(EditBox editBox, bool overwrite)
 858       {
 859          ide.UpdateStateLight(ide.ovr, overwrite);
 860       }
 861
 862       void NotifyUpdate(EditBox editBox)
 863       {
 864          if(designer)
 865          {
 866             if(!skipModified)
 867             {
 868                codeModified = true;
 869                designer.modifiedDocument = true;
 870             }
 871          }
 872          modifiedDocument = true;
 873       }
 874
 875       bool NotifyUnsetModified(EditBox editBox)
 876       {
 877          modifiedDocument = false;
 878          return true;
 879       }
 880
 881       bool NotifyCharsAdded(EditBox editBox, BufferLocation before, BufferLocation after, bool pasteOperation)
 882       {
 883          if(!loadingFile && after.y != before.y)
 884          {
 885             ProjectView projectView = ide.projectView;
 886             if(projectView && fileName)
 887             {
 888                int c;
 889                // HOW WE MIGHT WANT TO DO IT:
 890                char * text = before.line.text;
 891                for(c = before.x-1; c>= 0; c--)
 892                   if(!isspace(text[c]))
 893                      break;
 894                ide.debugger.MoveIcons(fileName, before.y + (((!pasteOperation && c > -1) || !after.line.count) ? 1 : 0), after.y - before.y, false);
 895
 896                // HOW VISUAL STUDIO DOES IT:
 897                /*
 898                char * text = after.line.text;
 899                for(c = after.line.count-1; c>= 0; c--)
 900                   if(!isspace(text[c]))
 901                      break;
 902                ide.debugger.MoveIcons(fileName, before.y + ((c < 0) ? 1 : 0), after.y - before.y, false);
 903                */
 904             }
 905             Update({ 0, 0, editBox.position.x, clientSize.h });
 906             UpdateMarginSize();
 907          }
 908
 909          if(!updatingCode)
 910          {
 911             ObjectInfo oClass;
 912
 913             for(oClass = classes.first; oClass; oClass = oClass.next)
 914             {
 915                ObjectInfo object;
 916                for(object = oClass.instances.first; object; object = object.next)
 917                {
 918                   if(object.instCode)
 919                   {
 920                      object.instCode.loc.start.AdjustAdd(before, after);
 921                      object.instCode.loc.end.AdjustAdd(before, after);
 922                   }
 923                }
 924                if(oClass.instCode)
 925                {
 926                   oClass.classDefinition.loc.start.AdjustAdd(before, after);
 927                   oClass.classDefinition.loc.end.AdjustAdd(before, after);
 928                }
 929             }
 930
 931             if(!pasteOperation)
 932             {
 933                expectingMove = true;
 934                if(membersListShown)
 935                {
 936                   bool hide = false;
 937                   if(before.y != after.y)
 938                      hide = true;
 939                   else
 940                   {
 941                      char * buffer = membersLine.text;
 942                      int c;
 943                      bool firstChar = true;
 944                      bool addedChar = false;
 945                      char string[1024];
 946                      int len = 0;
 947
 948                      DataRow row;
 949
 950                      membersLoc.end.charPos += after.x - Max(membersLoc.start.charPos, before.x);
 951
 952                      for(c = membersLoc.start.charPos; c<membersLoc.end.charPos && len < sizeof(string)-1; c++)
 953                      {
 954                         bool isSpace = (buffer[c] == ' ' || buffer[c] == '\t');
 955                         if(!isalnum(buffer[c]) && buffer[c] != '_' && (!isSpace || !firstChar)) //|| membersList.currentRow
 956                         {
 957                            hide = true;
 958                            break;
 959                         }
 960                         if(!isSpace)
 961                            firstChar = false;
 962                         else if(firstChar)
 963                         {
 964                            membersLoc.start.charPos++;
 965                            addedChar = true;
 966                         }
 967
 968                         if(!firstChar)
 969                            string[len++] = buffer[c];
 970                      }
 971                      if(firstChar)
 972                      {
 973                         row = membersList.currentRow;
 974                         if(row && row.selected)
 975                         {
 976                            hide = true;
 977                            if(addedChar)
 978                               membersLoc.start.charPos--;
 979                         }
 980                      }
 981
 982                      string[len] = 0;
 983
 984                      if(!hide)
 985                      {
 986                         row = membersList.FindSubString(string);
 987                         if(row)
 988                            membersList.currentRow = row;
 989                         else
 990                         {
 991                            row = membersList.FindSubStringi(string);
 992                            if(row)
 993                               membersList.currentRow = row;
 994                            membersList.currentRow.selected = false;
 995                         }
 996                         if(row)
 997                            membersList.SetScrollPosition(0, (row.index) * membersList.rowHeight);
 998                      }
 999                      else
1000                      {
1001                         row = membersList.currentRow;
1002                      }
1003
1004                      // Accept current string if hiding typing char
1005                      if(hide && row && row.selected)
1006                      {
1007                         char * string = row.string;
1008                         int len = strlen(string);
1009                         membersLoc.end.charPos -= after.x - before.x;
1010                         editBox.GoToPosition(membersLine, membersLoc.start.line, membersLoc.start.charPos);
1011                         editBox.Delete(membersLine, membersLoc.start.line, membersLoc.start.charPos,
1012                                        membersLine, membersLoc.end.line, membersLoc.end.charPos);
1013                         editBox.PutS(string);
1014                         editBox.GoToPosition(membersLine, membersLoc.start.line, membersLoc.start.charPos + len + 1 /*after.x - before.x*/);
1015
1016                         after.x += membersLoc.start.charPos + len - before.x;
1017                         before.x = membersLoc.start.charPos + len;
1018                      }
1019                   }
1020                   if(hide)
1021                   {
1022                      membersList.Destroy(0);
1023                      membersListShown = false;
1024                   }
1025                }
1026                if(/*after.x - before.x == 1 && */after.y == before.y && !membersListShown)
1027                {
1028                   EditLine line = editBox.line;
1029                   char * text = line.text;
1030                   char ch = text[after.x-1];
1031                   if(ch == '.' || (ch == '>' && after.x-1 > 0 && text[after.x-1-1] == '-') || (ch == ':' && after.x-1 > 0 && text[after.x-1-1] == ':'))
1032                   {
1033
1034                      /*
1035                      // Can we call invoke auto complete here instead?
1036
1037
1038                      int line, charPos;
1039                      Expression exp;
1040                      void * l1, * l2;
1041                      int x1,y1, x2,y2;
1042                      int oldCharPos;
1043                      Point caret;
1044
1045                      // Force caret update already...
1046                      editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
1047                      editBox.SetSelPos(l1, y1, x1, l2, y2, x2);
1048
1049                      editBox.GetCaretPosition(&caret);
1050
1051
1052
1053                      // Go back in the buffer until no space before
1054                      //yydebug = true;
1055                      codeModified = true;
1056                      EnsureUpToDate();
1057                      SetYydebug(false);
1058                      {
1059                         EditBoxStream f { editBox = editBox };
1060                         oldCharPos = x1;
1061                         x1--;
1062                         x2--;
1063                         if(text[after.x-1] == '>')
1064                         {
1065                            x1--;
1066                            x2--;
1067                         }
1068
1069                         editBox.SetSelPos(l1, y1, x1, l2, y2, x2);
1070                         for(;;)
1071                         {
1072                            char ch;
1073                            if(!f.Seek(-1, current))
1074                               break;
1075                            f.Getc(&ch);
1076                            if(!isspace(ch)) break;
1077                            f.Seek(-1, current);
1078                         }
1079                         editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
1080
1081                         line = editBox.lineNumber + 1;
1082                         charPos = editBox.charPos + 1;
1083                         delete f;
1084                      }
1085
1086                      exp = FindExpTree(ast, line, charPos);
1087
1088                      if(exp)
1089                      {
1090                         Type type = exp.expType;
1091
1092                         if(type && text[after.x-1] != '.')
1093                         {
1094                            if(type.kind == TypePointer || type.kind == TypeArray)
1095                               type = type.type;
1096                            else
1097                               type = null;
1098                         }
1099
1100                         membersList.Clear();
1101                         ListMembers(type);
1102
1103                         if(membersList.rowCount)
1104                         {
1105                            membersList.Sort(null, 1);
1106                            membersList.master = this;
1107
1108                            caret.y += editBox.GetCaretSize();
1109                            caret.x -= 20;
1110
1111                            membersList.Create();
1112
1113                            {
1114                               int x = caret.x + editBox.GetAbsX() - app.desktop.GetAbsX() - editBox.GetScrollX();
1115                               int y = caret.y + editBox.GetAbsY() - app.desktop.GetAbsY() - editBox.GetScrollY();
1116                               Window parent = membersList.parent;
1117
1118                               if(!paramsAbove && (paramsShown || y + membersList.GetHeight() > parent.GetClientHeight()))
1119                               {
1120                                  y -= editBox.GetCaretSize() + membersList.GetHeight();
1121                                  membersAbove = true;
1122                               }
1123                               else
1124                                  membersAbove = false;
1125
1126                               membersList.position = { x, y };
1127                            }
1128
1129                            membersLine = l1;
1130                            membersLoc.start.line = line - 1;
1131                            membersLoc.start.charPos = oldCharPos;
1132                            membersLoc.end = membersLoc.start;
1133                            membersListShown = true;
1134                         }
1135                      }
1136
1137                      SetThisClass(null);
1138                      SetCurrentContext(globalContext);
1139                      */
1140                      codeModified = true;
1141                      skipModified = true;
1142                      if(text[after.x-1] == ':')
1143                         InvokeAutoComplete(false, 0, false);
1144                      else if(text[after.x-1] == '.')
1145                         InvokeAutoComplete(false, 1, false);
1146                      else if(text[after.x-1] == '>')
1147                         InvokeAutoComplete(false, 2, false);
1148                      skipModified = false;
1149                   }
1150                   else if(ch == '(' || ch == OpenBracket || ch == ',' || ch == '='  || ch == '?'  || ch == ':')
1151                   {
1152                      codeModified = true;
1153                      skipModified = true;
1154
1155                      if(InvokeAutoComplete(true, 0, false))
1156                      {
1157                         if(ch == '(' || ch == OpenBracket)
1158                            InvokeParameters(true, true, false);
1159                         else
1160                            InvokeParameters(this.functionType ? false : true, false, false);
1161                      }
1162
1163                      // InvokeAutoComplete(true, 0, false);
1164                      skipModified = false;
1165                   }
1166                   else if(ch == ')' || ch == '}' || ch == ';')
1167                   {
1168                      codeModified = true;
1169                      skipModified = true;
1170                      if(paramsShown)
1171                         InvokeParameters(false, true, false);
1172                      skipModified = false;
1173                   }
1174                   else
1175                   {
1176                      bool back = codeModified;
1177                      codeModified = false;
1178                      if(paramsShown)
1179                         InvokeParameters(false, false, true);
1180                      if(membersListShown)
1181                         InvokeAutoComplete(false, 0, true);
1182                      codeModified = back;
1183                   }
1184                }
1185                else
1186                {
1187                   bool back = codeModified;
1188                   codeModified = false;
1189
1190                   if(paramsShown)
1191                      InvokeParameters(false, false, true);
1192                   /*if(membersListShown)
1193                      InvokeAutoComplete(false, 0, true);*/
1194
1195                   codeModified = back;
1196                }
1197             }
1198          }
1199          return true;
1200       }
1201
1202       bool NotifyCharsDeleted(EditBox editBox, BufferLocation before, BufferLocation after, bool pasteOperation)
1203       {
1204          if(!loadingFile && after.y != before.y)
1205          {
1206             ProjectView projectView = ide.projectView;
1207             if(projectView && fileName)
1208                ide.debugger.MoveIcons(fileName, before.y + 1, before.y - after.y, before.x == 0);
1209             Update({ 0, 0, editBox.position.x, clientSize.h });
1210             UpdateMarginSize();
1211          }
1212
1213          if(!updatingCode)
1214          {
1215             ObjectInfo oClass;
1216
1217             for(oClass = classes.first; oClass; oClass = oClass.next)
1218             {
1219                ObjectInfo object;
1220                Location * loc;
1221                for(object = oClass.instances.first; object; object = object.next)
1222                {
1223                   if(object.instCode)
1224                   {
1225                      loc = &object.instCode.loc;
1226
1227                      if((before.y+1 < loc->start.line || (before.y+1 == loc->start.line && before.x+1 <= loc->start.charPos)) &&
1228                         (after.y+1 > loc->end.line    || (after.y+1 == loc->end.line && after.x+1 >= loc->end.charPos)))
1229                      {
1230                         object.instCode = null;
1231                      }
1232                      else
1233                      {
1234                         loc->start.AdjustDelete(before, after);
1235                         loc->end.AdjustDelete(before, after);
1236                      }
1237                   }
1238                }
1239                if(oClass.classDefinition)
1240                {
1241                   loc = &oClass.classDefinition.loc;
1242                   if((before.y+1 < loc->start.line || (before.y+1 == loc->start.line && before.x+1 <= loc->start.charPos)) &&
1243                      (after.y+1 > loc->end.line    || (after.y+1 == loc->end.line && after.x+1 >= loc->end.charPos)))
1244                   {
1245                      oClass.classDefinition = null;
1246                   }
1247                   else
1248                   {
1249                      loc->start.AdjustDelete(before, after);
1250                      loc->end.AdjustDelete(before, after);
1251                   }
1252                }
1253             }
1254
1255             if(membersListShown)
1256             {
1257                bool hide = false;
1258                if(pasteOperation || before.y != after.y)
1259                   hide = true;
1260                else
1261                {
1262                   char * buffer = membersLine.text;
1263                   int c;
1264                   bool firstChar = true;
1265                   char string[1024];
1266                   int len = 0;
1267
1268                   if(before.x >= membersLoc.start.charPos)
1269                   {
1270                      for(c = membersLoc.start.charPos; c<before.x && len < sizeof(string)-1; c++)
1271                      {
1272                         bool isSpace = (buffer[c] == ' ' || buffer[c] == '\t');
1273                         if(!isalnum(buffer[c]) && buffer[c] != '_' && (!isSpace || !firstChar))
1274                         {
1275                            hide = true;
1276                            break;
1277                         }
1278                         if(!isSpace) firstChar = false;
1279
1280                         if(!firstChar)
1281                            string[len++] = buffer[c];
1282                      }
1283                   }
1284                   else
1285                   {
1286                      // If deleting spaces before...
1287                      for(c = before.x; c<membersLoc.start.charPos; c++)
1288                      {
1289                         bool isSpace = (buffer[c] == ' ' || buffer[c] == '\t');
1290                         if(!isSpace)
1291                         {
1292                            hide = true;
1293                            break;
1294                         }
1295                      }
1296                      if(!hide)
1297                         membersLoc.start.charPos = before.x;
1298                   }
1299
1300                   if(membersLoc.end.charPos >= after.x)
1301                   {
1302                      for(c = after.x; c<membersLoc.end.charPos && len < sizeof(string)-1; c++)
1303                      {
1304                         bool isSpace = (buffer[c] == ' ' || buffer[c] == '\t');
1305                         if(!isalnum(buffer[c]) && buffer[c] != '_' && (!isSpace || !firstChar))
1306                         {
1307                            hide = true;
1308                            break;
1309                         }
1310                         if(!isSpace) firstChar = false;
1311
1312                         if(!firstChar)
1313                            string[len++] = buffer[c];
1314                      }
1315                   }
1316                   else
1317                      hide = true;
1318
1319                   string[len] = '\0';
1320
1321                   membersLoc.end.charPos -= after.x - before.x;
1322                   if(!hide)
1323                   {
1324                      DataRow row;
1325                      row = membersList.FindSubString(string);
1326                      if(!row)
1327                      {
1328                         row = membersList.FindSubStringi(string);
1329                         if(row)
1330                            membersList.currentRow = row;
1331                         membersList.currentRow.selected = false;
1332                      }
1333                      else
1334                         membersList.currentRow = row;
1335                      if(row)
1336                         membersList.SetScrollPosition(0, row.index * membersList.rowHeight);
1337                   }
1338                }
1339                if(hide)
1340                {
1341                   membersList.Destroy(0);
1342                   membersListShown = false;
1343                }
1344
1345                /*
1346                if(paramsShown)
1347                {
1348                   InvokeParameters(false, false);
1349                }
1350                */
1351             }
1352          }
1353          return true;
1354       }
1355
1356       bool NotifyDropped(EditBox editBox, int x, int y)
1357       {
1358          char * controlClass = toolBox.controlClass;
1359          if(controlClass && controlClass[0])
1360          {
1361             Instance control;
1362             ObjectInfo object;
1363             ObjectInfo classObject;
1364
1365             //editBox.NotifyCaretMove(this, editBox, y, x);
1366             editBox.GoToLineNum(y);
1367             editBox.GoToPosition(editBox.line, y, x);
1368
1369             classObject = selected ? selected.oClass : null;
1370
1371             if((!selected || selected == classObject) && classObject && classObject.instances.first)
1372                selected = classObject.instances.last;
1373
1374             UpdateFormCode();
1375             control = eInstance_New(eSystem_FindClass(privateModule, controlClass));
1376             if(control)
1377             {
1378                AddObject(control, &object);
1379
1380                designer.CreateObject(control, object, false, classObject.instance);
1381                // designer.PostCreateObject(control, object, false, classObject.instance);
1382                designer.DroppedObject(control, object, false, classObject.instance);
1383
1384                sheet.AddObject(object, object.name, typeData /* className*/, true);
1385
1386                UpdateFormCode();
1387                //codeModified = true;
1388                EnsureUpToDate();
1389             }
1390          }
1391          return true;
1392       }
1393
1394       bool NotifyKeyDown(EditBox editBox, Key key, unichar ch)
1395       {
1396          if(key == ctrlSpace)
1397          {
1398             membersList.Destroy(0);
1399             membersListShown = false;
1400             InvokeAutoComplete(false, 0, false);
1401             return false;
1402          }
1403          else if(key == Key { space, ctrl = true, shift = true })
1404             InvokeParameters(false, true, false);
1405          else if(key == escape)
1406             ide.RepositionWindows(true);
1407          else if(key == ctrlF7)
1408          {
1409             if(ide.projectView)
1410             {
1411                ProjectNode node = ide.projectView.GetNodeForCompilationFromWindow(this, false, null, null);
1412                if(!node)
1413                {
1414                   char * s;
1415                   s = PrintString($"The ", fileName, $" file is not part of any project.\n",
1416                      $"It can't be compiled.");
1417                   MessageBox { type = ok, /*parent = ide, */master = ide, text = $"File not in project error", contents = s }.Modal();
1418                   delete s;
1419                   return false;
1420                }
1421             }
1422          }
1423          return true;
1424       }
1425
1426       bool OnKeyDown(Key key, unichar ch)
1427       {
1428          CodeEditor editor = (CodeEditor)master;
1429          if(key == escape /*|| key == leftAlt || key == rightAlt || (key.ctrl && key.code != left && key.code != right && key.code != leftShift && key.code != rightShift && key.code !=  space)*/)
1430          {
1431             if(editor.membersListShown)
1432             {
1433                editor.membersList.Destroy(0);
1434                editor.membersListShown = false;
1435                return false;
1436             }
1437             if(editor.paramsShown)
1438             {
1439                editor.paramsList.Destroy(0);
1440                editor.paramsShown = false;
1441                FreeType(editor.functionType);
1442                FreeType(editor.instanceType);
1443
1444                editor.functionType = null;
1445                editor.instanceType = null;
1446                editor.paramsID = -1;
1447                return false;
1448             }
1449          }
1450          return EditBox::OnKeyDown(key, ch);
1451       }
1452
1453       void OnVScroll(ScrollBarAction action, int position, Key key)
1454       {
1455          if(anchor.left.distance)
1456          {
1457             Box box { 0, 0, anchor.left.distance-1, parent.clientSize.h - 1 };
1458             parent.Update(box);
1459          }
1460          EditBox::OnVScroll(action, position, key);
1461          {
1462             CodeEditor ce = (CodeEditor)parent;
1463             if(ce.openedFileInfo)
1464                ce.openedFileInfo.ScrollChange({ scroll.x, position });
1465          }
1466       }
1467
1468       void OnHScroll(ScrollBarAction action, int position, Key key)
1469       {
1470          EditBox::OnHScroll(action, position, key);
1471          {
1472             CodeEditor ce = (CodeEditor)parent;
1473             if(ce.openedFileInfo)
1474                ce.openedFileInfo.ScrollChange({ position, scroll.y });
1475          }
1476       }
1477    };
1478    ListBox membersList
1479    {
1480       master = this,
1481       fullRowSelect = false,
1482       interim = true,
1483       autoCreate = false,
1484       borderStyle = bevel;
1485       // size = { 200, 400 };
1486
1487       bool NotifyDoubleClick(ListBox listBox, int x, int y, Modifiers mods)
1488       {
1489          DataRow row = listBox.currentRow;
1490          if(row)
1491          {
1492             char * string = row.string;
1493
1494             editBox.GoToPosition(membersLine, membersLoc.start.line, membersLoc.start.charPos);
1495             editBox.Delete(
1496                membersLine, membersLoc.start.line, membersLoc.start.charPos,
1497                membersLine, membersLoc.end.line, membersLoc.end.charPos);
1498             editBox.PutS(string);
1499
1500             listBox.Destroy(0);
1501             membersListShown = false;
1502          }
1503          return true;
1504       }
1505
1506       bool OnKeyDown(Key key, unichar ch)
1507       {
1508          CodeEditor editor = (CodeEditor) master;
1509          if(key == escape || key == leftAlt || key == rightAlt ||
1510             (key.ctrl && key.code != left && key.code != right &&
1511              key.code != leftShift && key.code != rightShift && key.code != space))
1512          {
1513             bool result = true;
1514             if(editor.paramsShown)
1515             {
1516                if(key == escape)
1517                   result = false;
1518                editor.paramsList.Destroy(0);
1519                editor.paramsShown = false;
1520             }
1521             if(editor.membersListShown)
1522             {
1523                if(key == escape)
1524                   result = false;
1525                editor.membersList.Destroy(0);
1526                editor.membersListShown = false;
1527             }
1528
1529             FreeType(editor.functionType);
1530             editor.functionType = null;
1531
1532             FreeType(editor.instanceType);
1533             editor.instanceType = null;
1534
1535             editor.paramsID = -1;
1536
1537             return result;
1538          }
1539          else
1540             return editor.editBox.OnKeyDown(key, ch);
1541          return false;
1542       }
1543
1544       /*bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct)
1545       {
1546          CodeEditor editor = (CodeEditor)master;
1547          Window rw = previous ? previous.rootWindow : null;
1548          if(!active && rw != editor.paramsList)
1549          {
1550             Destroy(0);
1551             editor.membersListShown = false;
1552          }
1553          return ListBox::OnActivate(active, previous, goOnWithActivation, direct);
1554       }*/
1555
1556       bool OnKeyHit(Key key, unichar ch)
1557       {
1558          CodeEditor editor = (CodeEditor) master;
1559
1560          switch(key)
1561          {
1562             case enter: case tab:
1563             {
1564                DataRow row = currentRow;
1565                if(row && row.selected)
1566                {
1567                   char * string = row.string;
1568
1569                   editor.editBox.GoToPosition(editor.membersLine, editor.membersLoc.start.line, editor.membersLoc.start.charPos);
1570                   editor.editBox.Delete(
1571                      editor.membersLine, editor.membersLoc.start.line, editor.membersLoc.start.charPos,
1572                      editor.membersLine, editor.membersLoc.end.line, editor.membersLoc.end.charPos);
1573                   editor.editBox.PutS(string);
1574
1575                   Destroy(0);
1576                   editor.membersListShown = false;
1577                }
1578                else
1579                   editor.editBox.OnKeyHit(key, ch);
1580                break;
1581             }
1582             case down:
1583             case up:
1584             case pageDown:
1585             case pageUp:
1586             case home:
1587             case end:
1588             {
1589                return ListBox::OnKeyHit(key, ch);
1590             }
1591             default:
1592             {
1593                /*
1594                bool result;
1595                // If before . or after
1596                //listBox.Destroy(true);
1597                result = editor.editBox.OnKeyHit(key, ch);
1598                return result;
1599                */
1600                return true;
1601             }
1602          }
1603
1604          return false;
1605       }
1606    };
1607
1608    Window paramsList
1609    {
1610       master = this,
1611       interim = true,
1612       clickThrough = true,
1613       autoCreate = false,
1614       borderStyle = contour,
1615       cursor = null,
1616       background = { 255,255,225 },
1617
1618       OnKeyDown = membersList.OnKeyDown;
1619
1620       /*bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool direct)
1621       {
1622          CodeEditor editor = (CodeEditor)master;
1623          Window rw = previous ? previous.rootWindow : null;
1624          if(!active && previous != editor.editBox && rw != editor.membersList)
1625          {
1626             Destroy(0);
1627             editor.paramsShown = false;
1628          }
1629          return Window::OnActivate(active, previous, goOnWithActivation, direct);
1630       }*/
1631
1632       bool OnKeyHit(Key key, unichar ch)
1633       {
1634          CodeEditor editor = (CodeEditor)master;
1635
1636          if(!editor.membersListShown || editor.membersList.OnKeyHit(key, ch))
1637          {
1638             /*
1639             bool result = true; editor.editBox.OnKeyHit(key, ch);
1640             return (!created) ? false : result;
1641             */
1642             return true;
1643          }
1644          return false;
1645       }
1646
1647       void OnRedraw(Surface surface)
1648       {
1649          CodeEditor editor = (CodeEditor) master;
1650          Type type = editor.functionType ? editor.functionType : editor.instanceType;
1651          Type param;
1652          Type methodType = null;
1653
1654          char string[1024];
1655
1656          int functionW, nameW = 0;
1657          int totalW = 0;
1658          int spaceW, spaceH, commaW, commaWB, parW;
1659          int availW = 1024;
1660          int maxW = 0, lineW = 0;
1661          int realW = 0;
1662          int height = 0;
1663          int x = 2, y = 2;
1664          int id = 0;
1665
1666          Font font = editor.normalFont.font;
1667          Font boldFont = editor.boldFont.font;
1668          Display display = this.display;
1669
1670          if(!type) { return; };
1671
1672          if(type.kind == TypeKind::methodType) { methodType = type; type = type.method.dataType; }
1673
1674          display.FontExtent(boldFont, " ", 1, &spaceW, &spaceH);
1675          display.FontExtent(font, ", ", 2, &commaW, null);
1676          display.FontExtent(boldFont, ", ", 2, &commaWB, null);
1677          display.FontExtent(font, ")", 1, &parW, null);
1678
1679          string[0] = 0;
1680          if(editor.functionType)
1681          {
1682             PrintType(type.returnType, string, true, true);
1683             display.FontExtent(font, string, strlen(string), &functionW, null);
1684             if(type.name)
1685                display.FontExtent(font, type.name, strlen(type.name), &nameW, null);
1686             totalW = nameW + functionW + 2 * parW;
1687          }
1688          else
1689          {
1690             PrintType(type, string, (type.kind == functionType) ? true : false, true); // true);
1691             display.FontExtent(boldFont, string, strlen(string), &functionW, null);
1692             if(instanceName && type.kind != functionType)
1693                display.FontExtent(boldFont, instanceName, strlen(instanceName), &nameW, null);
1694             totalW = functionW + nameW;
1695             surface.TextFont(boldFont);
1696          }
1697
1698          surface.WriteText(x, y, string, strlen(string));
1699          x += functionW + spaceW;
1700
1701          if(editor.functionType)
1702          {
1703             if(type.name)
1704                surface.WriteText(x, y, type.name, strlen(type.name));
1705             x += nameW;
1706             surface.WriteText(x, y, "(", 1);
1707             x += parW;
1708
1709             if(methodType && !methodType.staticMethod && methodType.methodClass)
1710             {
1711                int tw = 0, width;
1712
1713                if(id == editor.paramsID)
1714                   surface.TextFont(boldFont);
1715
1716                if(methodType.methodClass)
1717                   surface.TextExtent(methodType.methodClass.name, strlen(methodType.methodClass.name), &tw, null);
1718
1719                width = tw;
1720
1721                if(type.params.first && (((Type)type.params.first).kind != voidType || type.params.count > 1))
1722                   width += ((id == editor.paramsID) ? commaWB : commaW);
1723
1724                if(!height)
1725                   maxW = lineW;
1726
1727                if(lineW && ((height && lineW + width > maxW) || (totalW + lineW + width + 20 > availW)))
1728                {
1729                   height += spaceH;
1730                   lineW = 0;
1731
1732                   x = 2 + nameW + spaceW + functionW + parW;
1733                   y += spaceH;
1734
1735                }
1736                if(methodType.methodClass)
1737                   surface.WriteText(x, y, methodType.methodClass.name, strlen(methodType.methodClass.name));
1738
1739                x += tw;
1740                if(type.params.first && (((Type)type.params.first).kind != voidType || type.params.count > 1))
1741                {
1742                   surface.WriteText(x, y, ",", 1);
1743                   x += ((id ==  editor.paramsID) ? commaWB : commaW);
1744                }
1745
1746                lineW += width;
1747
1748                if(lineW > realW)
1749                   realW = lineW;
1750
1751                if(id == editor.paramsID)
1752                   surface.TextFont(font);
1753                id ++;
1754             }
1755
1756             if(!methodType || (methodType.staticMethod || !methodType.methodClass) || !type.params.first || ((Type)type.params.first).kind != voidType || type.params.count > 1)
1757             {
1758                for(param = type.params.first; param; param = param.next)
1759                {
1760                   char paramString[1024];
1761                   int tw, width;
1762
1763                   if(id == editor.paramsID || (param.kind == ellipsisType && id < editor.paramsID && editor.paramsID != -1))
1764                      surface.TextFont(boldFont);
1765
1766                   paramString[0] = 0;
1767                   PrintType(param, paramString, true, true);
1768                   surface.TextExtent(paramString, strlen(paramString), &tw, null);
1769                   width = tw;
1770                   if(param.next) width += ((id ==  editor.paramsID) ? commaWB : commaW);
1771
1772                   if(!height)
1773                      maxW = lineW;
1774
1775                   if(lineW && ((height && lineW + width > maxW) || (totalW + lineW + width + 20 > availW)))
1776                   {
1777                      height += spaceH;
1778                      lineW = 0;
1779
1780                      x = 2 + nameW + spaceW + functionW + parW;
1781                      y += spaceH;
1782
1783                   }
1784                   surface.WriteText(x, y, paramString, strlen(paramString));
1785                   x += tw;
1786                   if(param.next)
1787                   {
1788                      surface.WriteText(x, y, ",", 1);
1789                      x += ((id ==  editor.paramsID) ? commaWB : commaW);
1790                   }
1791
1792                   lineW += width;
1793
1794                   if(lineW > realW)
1795                      realW = lineW;
1796
1797                   if(id == editor.paramsID || (param.kind == ellipsisType && id < editor.paramsID && editor.paramsID != -1))
1798                      surface.TextFont(font);
1799                   id ++;
1800                }
1801             }
1802
1803             surface.WriteText(x, y, ")", 1);
1804          }
1805          else if(instanceName && type.kind != functionType)
1806          {
1807             surface.WriteText(x, y, instanceName, strlen(instanceName));
1808          }
1809       }
1810
1811       bool OnResizing(int * w, int * h)
1812       {
1813          CodeEditor editor = (CodeEditor) master;
1814          Type type = editor.functionType ? editor.functionType : editor.instanceType;
1815          Type param;
1816          Type methodType = null;
1817
1818          char string[1024];
1819
1820          int functionW = 0, nameW = 0;
1821          int totalW = 0;
1822          int spaceW, spaceH, commaW, commaWB, parW;
1823          int availW = 1024;
1824          int maxW = 0, lineW = 0;
1825          int realW = 0;
1826          int height = 0;
1827          int id = 0;
1828
1829          Font font = editor.normalFont.font;
1830          Font boldFont = editor.boldFont.font;
1831          Display display = this.display;
1832
1833          if(type.kind == TypeKind::methodType)
1834          {
1835             methodType = type;
1836             ProcessMethodType(type.method);
1837             type = type.method.dataType;
1838          }
1839
1840          display.FontExtent(boldFont, " ", 1, &spaceW, &spaceH);
1841          display.FontExtent(font, ", ", 2, &commaW, null);
1842          display.FontExtent(boldFont, ", ", 2, &commaWB, null);
1843          display.FontExtent(font, ")", 1, &parW, null);
1844
1845          string[0] = 0;
1846          if(editor.functionType && type)
1847          {
1848             PrintType(type.returnType, string, true, true);
1849             display.FontExtent(font, string, strlen(string), &functionW, null);
1850             if(type.name)
1851                display.FontExtent(font, type.name, strlen(type.name), &nameW, null);
1852             totalW = nameW + spaceW + functionW + 2 * parW;
1853          }
1854          else if(type)
1855          {
1856             PrintType(type, string, false, true); // /*true);
1857             display.FontExtent(boldFont, string, strlen(string), &functionW, null);
1858             if(instanceName && type.kind != functionType)
1859                display.FontExtent(boldFont, instanceName, strlen(instanceName), &nameW, null);
1860             totalW = functionW + nameW + spaceW;
1861          }
1862
1863          if(editor.functionType)
1864          {
1865             if(methodType)
1866             {
1867                int width = 0;
1868
1869                if(methodType.methodClass)
1870                   display.FontExtent((id == editor.paramsID) ? boldFont : font, methodType.methodClass.name, strlen(methodType.methodClass.name), &width, null);
1871                if(type.params.first && (((Type)type.params.first).kind != voidType || type.params.count > 1))
1872                   width += ((id == editor.paramsID) ? commaWB : commaW);
1873
1874                if(!height)
1875                   maxW = lineW;
1876
1877                if(lineW && ((height && lineW + width > maxW) || (totalW + lineW + width + 20 > availW)))
1878                {
1879                   height += spaceH;
1880                   lineW = 0;
1881                }
1882
1883                lineW += width;
1884
1885                if(lineW > realW)
1886                   realW = lineW;
1887
1888                id++;
1889             }
1890             if(!methodType || methodType.staticMethod || !type.params.first || ((Type)type.params.first).kind != voidType || type.params.count > 1)
1891             {
1892                for(param = type.params.first; param; param = param.next)
1893                {
1894                   char paramString[1024];
1895                   int width = 0;
1896
1897                   paramString[0] = 0;
1898                   PrintType(param, paramString, true, true);
1899                   display.FontExtent((id == editor.paramsID || param.kind == ellipsisType) ? boldFont : font, paramString, strlen(paramString), &width, null);
1900                   if(param.next)
1901                      width += ((id == editor.paramsID) ? commaWB : commaW);
1902
1903                   if(!height)
1904                      maxW = lineW;
1905
1906                   if(lineW && ((height && lineW + width > maxW) || (totalW + lineW + width + 20 > availW)))
1907                   {
1908                      height += spaceH;
1909                      lineW = 0;
1910                   }
1911
1912                   lineW += width;
1913
1914                   if(lineW > realW)
1915                      realW = lineW;
1916
1917                   id++;
1918                }
1919             }
1920          }
1921          height += spaceH;
1922
1923          *w = realW + totalW + 4;
1924          *h = height + 4;
1925          return true;
1926       }
1927    };
1928
1929    Menu fileMenu { menu, $"File", f };
1930    MenuItem { fileMenu, $"Save", s, Key { s, ctrl = true }, NotifySelect = MenuFileSave };
1931    MenuItem { fileMenu, $"Save As...", a, NotifySelect = MenuFileSaveAs };
1932
1933    Menu debugMenu { menu, $"Debug", d };
1934    MenuItem debugRunToCursor                { debugMenu, $"Run To Cursor", c, ctrlF10,                                                                  id = RTCMenuBits { false, false, false }, NotifySelect = RTCMenu_NotifySelect; };
1935    MenuItem debugSkipRunToCursor            { debugMenu, $"Run To Cursor Skipping Breakpoints", u, Key { f10, ctrl = true, shift = true },              id = RTCMenuBits { true,  false, false }, NotifySelect = RTCMenu_NotifySelect; };
1936    MenuItem debugRunToCursorAtSameLevel     { debugMenu, $"Run To Cursor At Same Level", l, altF10,                                                     id = RTCMenuBits { false, true,  false }, NotifySelect = RTCMenu_NotifySelect; };
1937    MenuItem debugSkipRunToCursorAtSameLevel { debugMenu, $"Run To Cursor At Same Level Skipping Breakpoints", g, Key { f10, shift = true, alt = true }, id = RTCMenuBits { true,  true,  false }, NotifySelect = RTCMenu_NotifySelect; };
1938 #if 0
1939    MenuItem debugBpRunToCursor                { debugMenu, $"BP Run To Cursor"/*, c, ctrlF10*/,                                                                  id = RTCMenuBits { false, false, true  }, NotifySelect = RTCMenu_NotifySelect; };
1940    MenuItem debugBpSkipRunToCursor            { debugMenu, $"BP Run To Cursor Skipping Breakpoints"/*, u, Key { f10, ctrl = true, shift = true }*/,              id = RTCMenuBits { true,  false, true  }, NotifySelect = RTCMenu_NotifySelect; };
1941    MenuItem debugBpRunToCursorAtSameLevel     { debugMenu, $"BP Run To Cursor At Same Level"/*, l, altF10*/,                                                     id = RTCMenuBits { false, true,  true  }, NotifySelect = RTCMenu_NotifySelect; };
1942    MenuItem debugBpSkipRunToCursorAtSameLevel { debugMenu, $"BP Run To Cursor At Same Level Skipping Breakpoints"/*, g, Key { f10, shift = true, alt = true }*/, id = RTCMenuBits { true,  true,  true  }, NotifySelect = RTCMenu_NotifySelect; };
1943 #endif
1944    bool RTCMenu_NotifySelect(MenuItem selection, Modifiers mods)
1945    {
1946       ProjectView projectView = ide.projectView;
1947       if(!projectView.buildInProgress)
1948       {
1949          RTCMenuBits bits = (RTCMenuBits)selection.id;
1950          int line = editBox.lineNumber + 1;
1951          if(projectView)
1952          {
1953             CompilerConfig compiler = ideSettings.GetCompilerConfig(ide.workspace.compiler);
1954             ProjectConfig config = projectView.project.config;
1955             int bitDepth = ide.workspace.bitDepth;
1956             bool useValgrind = ide.workspace.useValgrind;
1957             ide.debugger.RunToCursor(compiler, config, bitDepth, useValgrind, fileName, line, bits.ignoreBreakpoints, bits.atSameLevel, bits.oldImplementation);
1958             delete compiler;
1959          }
1960       }
1961       return true;
1962    }
1963    MenuDivider { debugMenu };
1964    MenuItem debugToggleBreakpoint
1965    {
1966       debugMenu, $"Toggle Breakpoint", t, f9;
1967       bool NotifySelect(MenuItem selection, Modifiers mods)
1968       {
1969          ProjectView projectView = ide.projectView;
1970          if(projectView && fileName)
1971          {
1972             int line = editBox.lineNumber + 1;
1973             ide.debugger.ToggleBreakpoint(fileName, line);
1974             Update(null);
1975          }
1976          return true;
1977       }
1978    };
1979
1980    bool debugClosing;
1981    int lastLine;
1982
1983    //MenuItem viewDesignerItem, viewProperties, viewMethods;
1984
1985    bool OnCreate(void)
1986    {
1987       designer.parent = parent;
1988       designer.Create();
1989
1990       toolBox = ((IDEWorkSpace)master).toolBox;
1991       incref toolBox;
1992       // Debugger bug here: value of toolBox appears as 0
1993
1994       sheet = ((IDEWorkSpace)master).sheet;
1995       incref sheet;
1996       return true;
1997    }
1998
1999    bool OnClose(bool parentClosing)
2000    {
2001       if(!parentClosing)
2002       {
2003          if(ide.workspace && fileName)
2004             ide.workspace.UpdateOpenedFileInfo(fileName, closed);
2005          if(inUseDebug && !debugClosing)
2006          {
2007             debugClosing = true;
2008             closing = false;
2009             if(CloseConfirmation(false))
2010             {
2011                visible = false;
2012                if(modifiedDocument)
2013                   OnFileModified({ modified = true }, null);
2014             }
2015             debugClosing = false;
2016             return false;
2017          }
2018          if(designer && !designer.closing)
2019          {
2020             if(designer.visible)
2021             {
2022                visible = false;
2023                return false;
2024             }
2025             /*else
2026             {
2027                //Window formEditor = designer;
2028                //formEditor.Destroy(0);
2029             }*/
2030          }
2031          ide.AdjustFileMenus();
2032       }
2033       return true;
2034    }
2035
2036    void OnDestroy(void)
2037    {
2038       ObjectInfo oClass, next;
2039       Class windowClass = eSystem_FindClass(this.privateModule, "ecere::gui::Window");
2040
2041       FreeType(this.functionType);
2042       FreeType(this.instanceType);
2043
2044       if(designer)
2045       {
2046          designer.Reset();
2047          designer.codeEditor = null;
2048          designer.Destroy(0);
2049          delete designer;
2050       }
2051
2052       for(oClass = (classes).first, next = oClass ? oClass.next : null; oClass; oClass = next, next = next ? (next.next) : null)
2053       {
2054          ObjectInfo object, next;
2055
2056          for(object = oClass.instances.first; object; object = next)
2057          {
2058             next = object.next;
2059             if(object.instance)
2060             {
2061                Designer::DestroyObject(object.instance);
2062                delete object.instance;
2063             }
2064             sheet.DeleteObject(object);
2065             delete object.name;
2066             oClass.instances.Delete(object);
2067          }
2068          if(oClass.instance)
2069          {
2070             Designer::DestroyObject(oClass.instance);
2071             delete oClass.instance;
2072          }
2073          sheet.DeleteObject(oClass);
2074          delete oClass.name;
2075          classes.Delete(oClass);
2076       }
2077
2078       if(windowClass && windowClass.data)
2079          UnapplySkin(windowClass);
2080
2081       FreeParser();
2082
2083       if(sheet.codeEditor == this)
2084       {
2085          sheet.codeEditor = null;
2086          toolBox.codeEditor = null;
2087       }
2088       delete sheet;
2089       delete toolBox;
2090
2091       {
2092          ProjectView projectView = ide.projectView;
2093          if(projectView)
2094          {
2095             ProjectNode node = projectView.GetNodeFromWindow(this, null, true, false, null);
2096             if(node && node.modified)
2097             {
2098                node.modified = false;
2099                projectView.Update(null);
2100             }
2101          }
2102       }
2103    }
2104
2105    bool OnActivate(bool active, Window previous, bool * goOnWithActivation, bool directActivation)
2106    {
2107       // WHY WAS THIS HERE? I think this was here because once you move a window in the ide it's hard to reposition it correctly
2108       /*
2109       if(directActivation)
2110          ide.RepositionWindows(false);    // Moved this up before as resizing causes NotifyCaretMove to be called on all editors
2111       */
2112       if(active && directActivation)
2113       {
2114          AdjustDebugMenus();
2115          if(openedFileInfo)
2116             openedFileInfo.Activate();
2117          if(designer)
2118          {
2119             int line, charPos;
2120             Location * loc = null;
2121             UpdateFormCode(); // To ensure update when modifying properties...
2122
2123             // Got to the right spot in code so we don't lose our form selection...
2124             if(selected)
2125             {
2126                if(selected.instCode)
2127                   loc = &selected.instCode.loc;
2128                else if(selected.classDefinition)
2129                   loc = &selected.classDefinition.loc;
2130             }
2131             line = editBox.lineNumber + 1;
2132             charPos = editBox.charPos + 1;
2133             if(fixCaret)
2134             {
2135                fixCaret = false;
2136
2137                if(selected && !loc->Inside(line, charPos))
2138                {
2139                   editBox.GoToPosition(null, loc->start.line - 1, loc->start.charPos - 1);
2140                   line = editBox.lineNumber + 1;
2141                   charPos = editBox.charPos + 1;
2142                }
2143                else if(selected && selected.classDefinition)
2144                {
2145                   ObjectInfo object;
2146                   for(object = selected.instances.first; object; object = object.next)
2147                   {
2148                      if(object.instCode)
2149                      {
2150                         if(object.instCode.loc.Inside(line, charPos))
2151                            break;
2152                      }
2153                   }
2154                   if(object)
2155                   {
2156                      editBox.GoToPosition(null, loc->start.line - 1, loc->start.charPos - 1);
2157                      line = editBox.lineNumber + 1;
2158                      charPos = editBox.charPos + 1;
2159                   }
2160                }
2161             }
2162
2163             ProcessCaretMove(editBox, line, charPos);
2164          }
2165       }
2166       if(!active)
2167       {
2168          if(membersListShown)
2169          {
2170             membersList.Destroy(0);
2171             membersListShown = false;
2172          }
2173          if(paramsShown)
2174          {
2175             paramsList.Destroy(0);
2176             paramsShown = false;
2177             FreeType(functionType);
2178             FreeType(instanceType);
2179
2180             functionType = null;
2181             instanceType = null;
2182             paramsID = -1;
2183          }
2184       }
2185       return true;
2186    }
2187
2188    bool OnSaveFile(char * fileName)
2189    {
2190       File f;
2191       if(designer)
2192       {
2193          UpdateFormCode();
2194       }
2195       f = FileOpen(fileName, write);
2196       if(f)
2197       {
2198          if(!ide.projectView)
2199             ide.ChangeFileDialogsDirectory(codeEditorFileDialog.currentDirectory, true);
2200          if(designer)
2201          {
2202             if(!this.fileName)
2203                this.fileName = fileName;  // Put this here because the form designer will check for it...
2204             designer.fileName = fileName;
2205             designer.modifiedDocument = false;
2206          }
2207
2208          if(editBox.syntaxHighlighting)
2209          {
2210             // Nuke trailing spaces
2211             EditLine line;
2212             int y = 0;
2213             for(line = editBox.firstLine; line; line = line.next, y++)
2214             {
2215                String buffer = line.text;
2216                int count = line.count, i = count-1;
2217                while(i > 0 && isspace(buffer[i])) i--;
2218                if(i < count - 1)
2219                   editBox.Delete(line, y, i, line, y, count);
2220             }
2221          }
2222
2223          editBox.Save(f, false);
2224          modifiedDocument = false;
2225
2226          delete f;
2227          return true;
2228       }
2229       return false;
2230    }
2231
2232    bool OnFileModified(FileChange fileChange, char * param)
2233    {
2234       bool reload = false;
2235       if(visible == false && inUseDebug == true)
2236          ide.debugger.WatchesReleaseCodeEditor();
2237       else
2238       {
2239          char message[2048];
2240
2241          sprintf(message, $"The document %s was modified by another application.\n"
2242             "Would you like to reload it and lose your changes?", fileName);
2243          if(MessageBox { type = yesNo, master = /*parent = */parent, text = $"Document has been modified",
2244             contents = message }.Modal() == yes)
2245             reload = true;
2246       }
2247
2248       if(reload)
2249       {
2250          File f = FileOpen(fileName, read);
2251          if(f)
2252          {
2253             int lineNumber, charPos, len;
2254             Point scroll;
2255
2256             loadingFile = true;
2257             updatingCode = true;
2258             lineNumber = editBox.lineNumber;
2259             charPos = editBox.charPos;
2260             scroll = editBox.scroll;
2261             editBox.Clear();
2262             editBox.Load(f);
2263             lineNumber = lineNumber < editBox.numLines ? lineNumber : editBox.numLines - 1;
2264             len = strlen(editBox.line.text);
2265             editBox.GoToLineNum(lineNumber);
2266             editBox.GoToPosition(editBox.line, lineNumber, charPos <= len ? charPos - 1 : (len ? len - 1 : 0));
2267             editBox.scroll = scroll;
2268             updatingCode = false;
2269             loadingFile = false;
2270
2271             codeModified = true;
2272             if(designer)
2273             {
2274                UpdateFormCode();
2275                designer.modifiedDocument = false;
2276             }
2277             modifiedDocument = false;
2278
2279             delete f;
2280          }
2281       }
2282       return true;
2283    }
2284
2285    void OnRedraw(Surface surface)
2286    {
2287       // Line Numbers
2288       surface.SetBackground(marginColor);
2289       surface.Area(0, 0, editBox.anchor.left.distance, clientSize.h - 1);
2290       if(ideSettings.showLineNumbers)
2291       {
2292          int currentLineNumber;
2293          int i;
2294          char lineFormat[16];
2295          char lineText[256];
2296          int spaceH;
2297
2298          surface.textOpacity = false;
2299          surface.font = font.font;
2300          surface.TextExtent(" ", 1, null, &spaceH);
2301          currentLineNumber = editBox.scroll.y / spaceH + 1;
2302          sprintf(lineFormat, " %%%du", maxLineNumberLength);
2303
2304          surface.SetForeground(lineNumbersColor);
2305          for(i = 0; i < editBox.clientSize.h - 4; i += spaceH)
2306          {
2307             // Highlight current line
2308             if(editBox.lineNumber == currentLineNumber - 1)
2309             {
2310                surface.SetBackground(selectedMarginColor);
2311                surface.Area(0, i, editBox.anchor.left.distance, i+spaceH-1);
2312                surface.SetBackground(marginColor);
2313             }
2314             sprintf(lineText, lineFormat, currentLineNumber);
2315             if(currentLineNumber <= editBox.numLines)
2316                surface.WriteText(editBox.syntaxHighlighting * 20, i+1,lineText,maxLineNumberLength+1);
2317             currentLineNumber++;
2318          }
2319       }
2320
2321       if(editBox.syntaxHighlighting && fileName && ide.projectView)
2322       {
2323          bool error, bpOnCursor, bpOnTopFrame, breakpointEnabled[128];
2324          int lineCursor, lineTopFrame, breakpointLines[128];
2325          int count, i, lineH, boxH, scrollY; //, firstLine; firstLine = editBox.firstLine;
2326          Debugger debugger = ide.debugger;
2327          BitmapResource bmpRes;
2328
2329          boxH = clientSize.h;
2330          scrollY = editBox.scroll.y;
2331          displaySystem.FontExtent(editBox.font.font, " ", 1, null, &lineH);
2332
2333          bpOnCursor = bpOnTopFrame = false;
2334          count = debugger.GetMarginIconsLineNumbers(fileName, breakpointLines, breakpointEnabled, 128, &error, &lineCursor, &lineTopFrame);
2335          if(count)
2336          {
2337             for(i = 0; i < count; i++)
2338             {
2339                if(breakpointLines[i] == lineCursor || breakpointLines[i] == lineTopFrame)
2340                {
2341                   bmpRes = breakpointEnabled[i] ? ide.bmpBpHalf : ide.bmpBpHalfDisabled;
2342                   if(breakpointLines[i] == lineCursor)
2343                      bpOnCursor = true;
2344                   if(breakpointLines[i] == lineTopFrame)
2345                      bpOnTopFrame = true;
2346                }
2347                else
2348                   bmpRes = breakpointEnabled[i] ? ide.bmpBp : ide.bmpBpDisabled;
2349
2350                DrawLineMarginIcon(surface, bmpRes, breakpointLines[i], lineH, scrollY, boxH);
2351             }
2352          }
2353          DrawLineMarginIcon(surface, error ? ide.bmpCursorError : ide.bmpCursor, lineCursor, lineH, scrollY, boxH);
2354          bmpRes = bpOnTopFrame ? (error ? ide.bmpTopFrameHalfError : ide.bmpTopFrameHalf) : (error ? ide.bmpTopFrameError : ide.bmpTopFrame);
2355          DrawLineMarginIcon(surface, bmpRes, lineTopFrame, lineH, scrollY, boxH);
2356       }
2357       if(editBox.anchor.left.distance)
2358       {
2359          if(editBox.horzScroll && editBox.horzScroll.visible)
2360          {
2361             surface.SetBackground(control);
2362             surface.Area(0, editBox.clientSize.h, editBox.anchor.left.distance, clientSize.h - 1);
2363          }
2364       }
2365    }
2366
2367    void DrawLineMarginIcon(Surface surface, BitmapResource resource, int line, int lineH, int scrollY, int boxH)
2368    {
2369       int lineY;
2370       if(line)
2371       {
2372          lineY = (line - 1) * lineH;
2373          if(lineY + lineH > scrollY && lineY /*+ lineH*/ < scrollY + boxH)
2374          {
2375             Bitmap bitmap = resource.bitmap;
2376             if(bitmap)
2377                surface.Blit(bitmap, 0, lineY - scrollY + (lineH - bitmap.height) / 2 + 1, 0, 0, bitmap.width, bitmap.height);
2378          }
2379       }
2380    }
2381
2382    watch(fileName)
2383    {
2384       char ext[MAX_EXTENSION];
2385       char * fileName = property::fileName;
2386
2387       if(SearchString(fileName, 0, "Makefile", false, true))
2388          editBox.useTab = true;
2389       designer.fileName = fileName;
2390
2391       if(fileName)
2392       {
2393          GetExtension(fileName, ext);
2394
2395          if(!strcmpi(ext, "ec") || !strcmpi(ext, "eh") || !strcmpi(ext, "c") || !strcmpi(ext, "h") || !strcmpi(ext, "cpp") ||
2396                !strcmpi(ext, "hpp") || !strcmpi(ext, "cxx") || !strcmpi(ext, "hxx") || !strcmpi(ext, "cc") || !strcmpi(ext, "hh") ||
2397                !strcmpi(ext, "m") || !strcmpi(ext, "mm") || !strcmpi(ext, "cs") || !strcmpi(ext, "java") || !strcmpi(ext, "y") || !strcmpi(ext, "l"))
2398             editBox.syntaxHighlighting = true;
2399          else
2400             editBox.syntaxHighlighting = false;
2401
2402          if(parsing && !strcmpi(ext, "ec"))
2403          {
2404             codeModified = true;
2405             EnsureUpToDate();
2406          }
2407
2408          maxLineNumberLength = 0;
2409          UpdateMarginSize();
2410       }
2411    };
2412
2413    bool UpdateMarginSize()
2414    {
2415       if(ideSettings.showLineNumbers)
2416       {
2417          int numLen = Max(4, nofdigits(editBox.numLines));
2418          int digitWidth;
2419          maxLineNumberLength = numLen;
2420          display.FontExtent(font.font, "0", 1, &digitWidth, null);
2421          editBox.anchor = Anchor
2422          {
2423             left = editBox.syntaxHighlighting * 20 + ideSettings.showLineNumbers * (maxLineNumberLength+2) * digitWidth,
2424             right = 0, top = 0, bottom = 0
2425          };
2426       }
2427       else
2428       {
2429          maxLineNumberLength = 0;
2430          editBox.anchor = Anchor
2431          {
2432             left = editBox.syntaxHighlighting * 20,
2433             right = 0, top = 0, bottom = 0
2434          };
2435       }
2436       return true;
2437    }
2438
2439    bool OnPostCreate()
2440    {
2441       UpdateMarginSize();
2442       return true;
2443    }
2444
2445    bool LoadFile(char * filePath)
2446    {
2447       File f = FileOpen(filePath, read);
2448       if(f)
2449       {
2450          // Added this here...
2451          fileName = filePath;
2452          loadingFile = true;
2453          updatingCode = true;
2454          editBox.Load(f);
2455          updatingCode = false;
2456          loadingFile = false;
2457          Create();
2458
2459          delete f;
2460          return true;
2461       }
2462       return false;
2463    }
2464
2465    void AdjustDebugMenus()
2466    {
2467       bool unavailable = ide.areDebugMenusUnavailable;
2468       bool isNotNotRunning    = unavailable || ide.isDebuggerRunning;
2469       bool isNotStopped       = unavailable || !ide.isDebuggerStopped;
2470       bool noBreakpointToggle = ide.isBreakpointTogglingUnavailable;
2471
2472       debugRunToCursor.disabled                = isNotNotRunning;
2473       debugSkipRunToCursor.disabled            = isNotNotRunning;
2474       debugRunToCursorAtSameLevel.disabled     = isNotStopped;
2475       debugSkipRunToCursorAtSameLevel.disabled = isNotStopped;
2476 #if 0
2477       debugBpRunToCursor.disabled                = isNotNotRunning;
2478       debugBpSkipRunToCursor.disabled            = isNotNotRunning;
2479       debugBpRunToCursorAtSameLevel.disabled     = isNotStopped;
2480       debugBpSkipRunToCursorAtSameLevel.disabled = isNotStopped;
2481 #endif
2482       debugToggleBreakpoint.disabled           = noBreakpointToggle;
2483    }
2484
2485    CodeEditor()
2486    {
2487       CodeObjectType c;
2488       ProjectView projectView = ide.projectView;
2489
2490       /*if(fileName)
2491          designer.fileName = fileName;
2492       else
2493       */
2494       if(designer)
2495       {
2496          char title[1024];
2497          sprintf(title, $"Untitled %d", documentID);
2498          // designer.fileName = CopyString(title);
2499          designer.fileName = title;
2500       }
2501
2502       AdjustDebugMenus();
2503
2504       for(c = 0; c < CodeObjectType::enumSize; c++)
2505          icons[c] = BitmapResource { iconNames[c], window = this };
2506
2507       codeModified = true;
2508       inUseDebug = false;
2509       return true;
2510    }
2511
2512    ~CodeEditor()
2513    {
2514
2515    }
2516
2517    void ModifyCode()
2518    {
2519       selected.modified = true;
2520       selected.oClass.modified = true;
2521
2522       designer.modifiedDocument = true;
2523       modifiedDocument = true;
2524       formModified = true;
2525    }
2526
2527    /****************************************************************************
2528                                  PARSING
2529    ****************************************************************************/
2530    void FreeParser()
2531    {
2532       if(ast != null)
2533       {
2534          FreeASTTree(ast);
2535          ast = null;
2536       }
2537       this.defines.Free(FreeModuleDefine);
2538       this.imports.Free(FreeModuleImport);   // Moved this after FreeAST because Debug printing causes ModuleImports to be created
2539
2540       FreeExcludedSymbols(this.excludedSymbols);
2541       FreeContext(this.globalContext);
2542       FreeIncludeFiles();
2543       FreeGlobalData(&this.globalData);
2544       FindCtx_Terminate();
2545       FindParams_Terminate();
2546
2547       if(GetGlobalContext() == globalContext)
2548       {
2549          SetGlobalData(null);
2550          SetGlobalContext(null);
2551          SetExcludedSymbols(null);
2552          SetTopContext(null);
2553          SetCurrentContext(null);
2554          SetDefines(null);
2555          SetImports(null);
2556          SetPrivateModule(null);
2557       }
2558
2559       if(this.privateModule)
2560       {
2561          FreeTypeData(this.privateModule);
2562          delete this.privateModule;
2563          this.privateModule = null;
2564       }
2565    }
2566
2567    void ParseCode()
2568    {
2569       static bool reentrant = false;
2570       External external;
2571       File editFile;
2572       EditLine l1, l2;
2573       int x1,x2,y1,y2;
2574       char * selectedClassName = null, * selectedName = null;
2575       int selectedPos = 0;
2576       Designer backDesigner;
2577       char oldWorkDir[MAX_LOCATION];
2578       char mainModuleName[MAX_FILENAME] = "";
2579       char * fileName;
2580       ImportedModule module;
2581       char extension[MAX_EXTENSION];
2582       PathBackup pathBackup { };
2583 #ifdef _TIMINGS
2584       Time parseCodeStart = GetTime();
2585       Time startTime, startFindClass;
2586
2587       findClassTotalTime = 0;
2588       checkTypeTotalTime = 0;
2589       externalImportTotalTime = 0;
2590       findClassIgnoreNSTotalTime = 0;
2591       findSymbolTotalTime = 0;
2592       //ResetClassFindTime();
2593 #endif
2594       Project project;
2595
2596       // This temporarily fixes issue with 2 overrides in release mode with VC6 (only happens with both ecere.dll and ide.exe compiled in release mode)
2597       if(reentrant) return;
2598       reentrant = true;
2599
2600       updatingCode++;
2601
2602       if(selected)
2603       {
2604          selectedClassName = CopyString(oClass.name);
2605          if(selected != oClass)
2606          {
2607             ObjectInfo object = this.selected;
2608             selectedName = CopyString(object.name);
2609             if(!selectedName)
2610             {
2611                ObjectInfo check;
2612                for(check = this.oClass.instances.first; check; check = check.next)
2613                {
2614                   if(check == object)
2615                      break;
2616                   selectedPos++;
2617                }
2618             }
2619          }
2620          else
2621             selectedPos = -1;
2622       }
2623
2624       editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
2625
2626       FindCtx_Terminate();
2627       FindParams_Terminate();
2628
2629       SetGlobalData(&globalData);
2630       SetGlobalContext(globalContext);
2631       SetExcludedSymbols(&excludedSymbols);
2632       SetTopContext(globalContext);
2633       SetCurrentContext(globalContext);
2634       SetDefines(&defines);
2635       SetImports(&imports);
2636       SetCurrentNameSpace(null);
2637
2638       /*
2639       sprintf(command, "C:\\Program Files\\Microsoft Visual Studio\\VC98\\Bin\\cl "
2640          "/nologo /D \"MSC\" /D \"WIN32\" /D \"NDEBUG\" /D \"_WINDOWS\" /D \"_MBCS\" "
2641          "/I \"C:\\Program Files\\Microsoft Visual Studio\\VC98\\Include\" "
2642          "/I T:\\ecere\\include /E %s", argv[1]);
2643       */
2644
2645       /*
2646       ChangeWorkingDir("e:\\ec");
2647       sprintf(command, "gcc -x c -E -");
2648       fileInput = DualPipeOpen({ output = true, input = true }, command);
2649       SetFileInput(fileInput);
2650       {
2651          for(;;)
2652          {
2653             byte buffer[8192];
2654             uint count = editFile.Read(buffer, 1, sizeof(buffer));
2655             if(count)
2656                fileInput.Write(buffer, 1, count);
2657             else
2658                break;
2659          }
2660          delete editFile;
2661          fileInput.CloseOutput();
2662       }
2663       */
2664
2665       // TOCHECK: COULDN'T WE CALL FreeParser here?
2666       // Clear everything
2667       FreeType(this.functionType);
2668       FreeType(this.instanceType);
2669       this.functionType = null;
2670       this.instanceType = null;
2671
2672       // Select nothing
2673       sheet.SelectObject(null);
2674
2675       designer.Reset();
2676
2677       selected = null;
2678
2679       // We don't want the designer to be notified of selection when deleting rows...
2680       backDesigner = designer;
2681       designer = null;
2682
2683       if(this.oClass)
2684       {
2685          ObjectInfo _class, next;
2686
2687          for(_class = classes.first; _class; _class = next)
2688          {
2689             ObjectInfo object;
2690
2691             next = _class.next;
2692
2693             for(;object = _class.instances.first;)
2694             {
2695                if(object.instance)
2696                {
2697                   Designer::DestroyObject(object.instance);
2698                   delete object.instance;
2699                }
2700                sheet.DeleteObject(object);
2701                delete object.name;
2702                _class.instances.Delete(object);
2703             }
2704             if(_class.instance)
2705             {
2706                Designer::DestroyObject(_class.instance);
2707                delete _class.instance;
2708             }
2709             sheet.DeleteObject(_class);
2710             delete _class.name;
2711             classes.Delete(_class);
2712          }
2713          this.oClass = null;
2714       }
2715
2716       {
2717          Class windowClass = eSystem_FindClass(this.privateModule, "ecere::gui::Window");
2718          if(windowClass && windowClass.data)
2719             UnapplySkin(windowClass);
2720       }
2721
2722       designer = backDesigner;
2723
2724       SetEchoOn(true);
2725       fileInput = editFile = EditBoxStream { editBox = editBox };
2726       SetFileInput(fileInput);
2727
2728       if(ast)
2729       {
2730          FreeASTTree(ast);
2731          ast = null;
2732          //SetAST(null);
2733       }
2734       defines.Free(FreeModuleDefine);
2735       imports.Free(FreeModuleImport);
2736
2737       FreeContext(this.globalContext);
2738       FreeExcludedSymbols(this.excludedSymbols);
2739
2740       FreeIncludeFiles();
2741       FreeGlobalData(&this.globalData);
2742
2743       if(this.privateModule)
2744       {
2745          FreeTypeData(this.privateModule);
2746          delete this.privateModule;
2747       }
2748
2749 #ifdef _TIMINGS
2750       startTime = GetTime();
2751       printf("Cleaning up took %.3f seconds\n", startTime - parseCodeStart);
2752
2753       printf("classes.count: %d\n", globalContext.classes.count);
2754 #endif
2755
2756       if(ide.workspace)
2757       {
2758          CompilerConfig compiler = ideSettings.GetCompilerConfig(ide.workspace.compiler);
2759          SetTargetBits(ide.workspace.bitDepth ? ide.workspace.bitDepth : GetHostBits());
2760          delete compiler;
2761       }
2762       this.privateModule = __ecere_COM_Initialize(false | ((GetTargetBits() == sizeof(uintptr) *8) ? 0 : GetTargetBits() == 64 ? 2 : 4), 1, null);
2763
2764       SetPrivateModule(privateModule);
2765
2766       {
2767          globalContext.types.Add((BTNode)Symbol { string = CopyString("uint"), type = ProcessTypeString("unsigned int", false) });
2768          globalContext.types.Add((BTNode)Symbol { string = CopyString("uint64"), type = ProcessTypeString("unsigned int64", false) });
2769          globalContext.types.Add((BTNode)Symbol { string = CopyString("uint32"), type = ProcessTypeString("unsigned int", false) });
2770          globalContext.types.Add((BTNode)Symbol { string = CopyString("uint16"), type = ProcessTypeString("unsigned short", false) });
2771          globalContext.types.Add((BTNode)Symbol { string = CopyString("byte"), type = ProcessTypeString("unsigned char", false) });
2772       }
2773
2774       fileName = this.fileName;
2775       project = null;
2776       if(ide.workspace && ide.workspace.projects && fileName)
2777       {
2778          for(p : ide.workspace.projects)
2779          {
2780             char path[MAX_LOCATION];
2781             ProjectNode pn;
2782             MakePathRelative(fileName, p.topNode.path, path);
2783             MakeSlashPath(path);
2784
2785             pn = p.topNode.FindWithPath(path, false);
2786             if(pn)
2787             {
2788                project = p;
2789                break;
2790             }
2791          }
2792       }
2793       if(!project)
2794          project = ide.project;
2795
2796       GetWorkingDir(oldWorkDir, MAX_LOCATION);
2797       if(project)
2798          ChangeWorkingDir(project.topNode.path);
2799
2800       SetSomeSourceFileStack(fileName ? fileName : "", 0); //strcpy(sourceFileStack[0], fileName ? fileName : "");
2801
2802       GetLastDirectory(fileName, mainModuleName);
2803       GetExtension(mainModuleName, extension);
2804
2805       SetBuildingEcereCom(false);
2806       SetBuildingEcereComModule(false);
2807
2808       // TODO: Get symbolsDir from project settings instead...
2809       if(ide.projectView)
2810       {
2811          CompilerConfig compiler = ideSettings.GetCompilerConfig(ide.workspace.compiler);
2812          ProjectConfig config = project.config;
2813          int bitDepth = ide.workspace.bitDepth;
2814          DirExpression objDir = project.GetObjDir(compiler, config, bitDepth);
2815          SetSymbolsDir(objDir.dir);
2816          ide.SetPath(true, compiler, config, bitDepth);
2817
2818          delete objDir;
2819          delete compiler;
2820          // SetIncludeDirs(ide.projectView.project.config.includeDirs);
2821          // SetSysIncludeDirs(ide.ideSettings.systemDirs[includes]);
2822       }
2823       else
2824       {
2825          switch(GetRuntimePlatform())
2826          {
2827             case win32: SetSymbolsDir("obj/debug.win32"); break;
2828             case tux:   SetSymbolsDir("obj/debug.linux"); break;
2829             case apple: SetSymbolsDir("obj/debug.apple"); break;
2830          }
2831          SetIncludeDirs(null);
2832          SetSysIncludeDirs(null);
2833       }
2834
2835       {
2836          if(ide.projectView && ide.projectView.IsModuleInProject(this.fileName))
2837          {
2838             // TODO FIX for configless project
2839             if(ide.project.config && ide.project.config.options && ide.project.config.options.preprocessorDefinitions)
2840             {
2841                for(item : ide.project.config.options.preprocessorDefinitions)
2842                {
2843                   if(!strcmp(item, "BUILDING_ECERE_COM"))
2844                   {
2845                      SetBuildingEcereCom(true);
2846                      break;
2847                   }
2848                }
2849             }
2850          }
2851
2852          if(!(strcmpi(mainModuleName, "instance.ec") && strcmpi(mainModuleName, "BinaryTree.ec") &&
2853             strcmpi(mainModuleName, "dataTypes.ec") && strcmpi(mainModuleName, "OldList.ec") &&
2854             strcmpi(mainModuleName, "String.ec") && strcmpi(mainModuleName, "BTNode.ec") &&
2855             strcmpi(mainModuleName, "Array.ec") && strcmpi(mainModuleName, "AVLTree.ec") &&
2856             strcmpi(mainModuleName, "BuiltInContainer.ec") && strcmpi(mainModuleName, "Container.ec") &&
2857             strcmpi(mainModuleName, "CustomAVLTree.ec") && strcmpi(mainModuleName, "LinkList.ec") &&
2858             strcmpi(mainModuleName, "List.ec") && strcmpi(mainModuleName, "Map.ec") &&
2859             strcmpi(mainModuleName, "Mutex.ec")))
2860          {
2861             SetBuildingEcereComModule(true);
2862          }
2863
2864          // Predeclare all classes
2865          {
2866             char symFile[MAX_FILENAME];
2867             char symLocation[MAX_LOCATION];
2868             ImportedModule module, next;
2869
2870             GetLastDirectory(fileName, symFile);
2871             ChangeExtension(symFile, "sym", symFile);
2872
2873             strcpy(symLocation, GetSymbolsDir());
2874             PathCat(symLocation, symFile);
2875
2876             // if(!GetEcereImported() && !GetBuildingEcereCom())
2877             if(!strcmp(extension, "ec") || !strcmp(extension, "eh"))
2878             {
2879 #ifdef _TIMINGS
2880                startTime = GetTime();
2881 #endif
2882                eModule_LoadStrict(privateModule, "ecereCOM", privateAccess);
2883 #ifdef _TIMINGS
2884                printf("Loading ecereCOM took %.3f seconds\n", GetTime() - startTime);
2885 #endif
2886             }
2887
2888 #ifdef _TIMINGS
2889             startTime = GetTime();
2890 #endif
2891             // LoadSymbols(symLocation, normalImport, true);
2892             LoadSymbols(symLocation, preDeclImport, false);
2893 #ifdef _TIMINGS
2894             printf("Loading symbols took %.3f seconds\n", GetTime() - startTime);
2895 #endif
2896
2897             for(module = defines.first; module; module = next)
2898             {
2899                next = module.next;
2900                if(module.type == moduleDefinition && strcmpi(module.name, mainModuleName))
2901                {
2902                   delete module.name;
2903                   defines.Delete(module);
2904                }
2905             }
2906          }
2907       }
2908       if(!strcmp(extension, "ec") || !strcmp(extension, "eh"))
2909       {
2910          SetDefaultDeclMode(privateAccess);
2911          SetDeclMode(privateAccess);
2912       }
2913       else
2914       {
2915          SetDefaultDeclMode(defaultAccess);
2916          SetDeclMode(defaultAccess);
2917       }
2918
2919       StripExtension(mainModuleName);
2920       module = ImportedModule { name = CopyString(mainModuleName), type = moduleDefinition };
2921       defines.AddName(module);
2922
2923    #ifdef _DEBUG
2924       // SetYydebug(true);
2925    #endif
2926       resetScanner();
2927
2928 #ifdef _TIMINGS
2929       startTime = GetTime();
2930       startFindClass = checkTypeTotalTime;
2931 #endif
2932       ParseEc();
2933 #ifdef _TIMINGS
2934       printf("ParseEc took %.3f seconds, out of which %.3f seconds were in CheckType\n", GetTime() - startTime, checkTypeTotalTime - startFindClass);
2935 #endif
2936       CheckDataRedefinitions();
2937       SetYydebug(false);
2938
2939       SetIncludeDirs(null);
2940       SetSysIncludeDirs(null);
2941
2942       delete editFile;
2943       fileInput = null;
2944       SetFileInput(null);
2945
2946       if(GetAST())
2947       {
2948          ast = GetAST();
2949
2950 #ifdef _TIMINGS
2951          startTime = GetTime();
2952 #endif
2953          PrePreProcessClassDefinitions();
2954          ComputeModuleClasses(privateModule);
2955          PreProcessClassDefinitions();
2956          ProcessClassDefinitions();
2957 #ifdef _TIMINGS
2958          printf("Initial Passes took %.3f seconds\n", GetTime() - startTime);
2959          startTime = GetTime();
2960 #endif
2961
2962          ComputeDataTypes();
2963 #ifdef _TIMINGS
2964          printf("ComputeDataTypes took %.3f seconds\n", GetTime() - startTime);
2965          startTime = GetTime();
2966 #endif
2967          ProcessInstantiations();
2968 #ifdef _TIMINGS
2969          printf("ProcessInstantiations took %.3f seconds\n", GetTime() - startTime);
2970 #endif
2971
2972          if(!strcmp(extension, "ec") || !strcmp(extension, "eh"))
2973          {
2974             Class windowClass = eSystem_FindClass(this.privateModule, "ecere::gui::Window");
2975             if(!windowClass || windowClass.internalDecl)
2976             {
2977 #ifdef _TIMINGS
2978                startTime = GetTime();
2979 #endif
2980                // *** COMMENTED THIS OUT DUE TO ecereCOM issues
2981                // eModule_Load(this.privateModule.application.allModules.first ? this.privateModule.application.allModules.first : this.privateModule, "ecere", privateAccess);
2982                eModule_Load(this.privateModule, "ecere", privateAccess);
2983 #ifdef _TIMINGS
2984                printf("Loading ecere.dll took %.3f seconds\n", GetTime() - startTime);
2985 #endif
2986             }
2987             windowClass = eSystem_FindClass(this.privateModule, "ecere::gui::Window");
2988
2989             if(windowClass && windowClass.data)
2990                ApplySkin(windowClass, app.currentSkin.name, null);
2991          }
2992
2993 #ifdef _TIMINGS
2994          startTime = GetTime();
2995 #endif
2996          for(external = ast->first; external; external = external.next)
2997          {
2998             if(external.type == classExternal)
2999             {
3000                ClassDefinition _class = external._class;
3001                if(_class.baseSpecs && _class.baseSpecs->first && ((Specifier)_class.baseSpecs->first).type == nameSpecifier ) // classSpecifier
3002                {
3003                   Class regClass = eSystem_FindClass(this.privateModule, ((Specifier)_class.baseSpecs->first).name);
3004                   if(regClass)
3005                   {
3006                      if(eClass_GetDesigner(regClass) && !GetBuildingEcereComModule())
3007                      {
3008                         Instance instance = eInstance_New(regClass);
3009                         ObjectInfo classObject
3010                         {
3011                            name = CopyString(_class._class.name);
3012                            instance = instance;
3013                            classDefinition = _class;
3014                            oClass = classObject;
3015                         };
3016                         Symbol symbol;
3017                         classes.Add(classObject);
3018
3019                         incref instance;
3020
3021                         // Moved this at bottom so that the file dialog doesn't show up in eCom
3022                         designer.CreateObject(instance, classObject, true, null);
3023                         sheet.AddObject(classObject, classObject.name ? classObject.name : _class._class.name, typeClass, false);
3024
3025                         if(_class.definitions)
3026                         {
3027                            ClassDef def;
3028                            ObjectInfo object;
3029                            for(def = _class.definitions->first; def; def = def.next)
3030                            {
3031                               switch(def.type)
3032                               {
3033                                  case defaultPropertiesClassDef:
3034                                  {
3035                                     MemberInit propDef;
3036                                     for(propDef = def.defProperties->first; propDef; propDef = propDef.next)
3037                                     {
3038                                        Identifier id = propDef.identifiers->first;
3039                                        if(id)
3040                                        {
3041                                           Property prop = eClass_FindProperty(regClass, id.string, this.privateModule);
3042                                           if(prop)
3043                                           {
3044                                              Class propertyClass = prop.dataTypeClass;
3045                                              if(!propertyClass)
3046                                                 propertyClass = prop.dataTypeClass = eSystem_FindClass(this.privateModule, prop.dataTypeString);
3047                                              if(prop.compiled && prop.Set && prop.Get && propertyClass && propDef.initializer && propDef.initializer.type == expInitializer && propDef.initializer.exp)
3048                                              {
3049                                                 FreeType(propDef.initializer.exp.destType);
3050                                                 propDef.initializer.exp.destType = MkClassType(propertyClass.name);
3051                                                 ProcessExpressionType(propDef.initializer.exp);
3052
3053                                                 if(propertyClass.type == structClass || propertyClass.type == noHeadClass || propertyClass.type == normalClass)
3054                                                 {
3055                                                    Expression computed = CopyExpression(propDef.initializer.exp);
3056                                                    ComputeExpression(computed);
3057
3058                                                    if(computed.isConstant && computed.type == instanceExp && !id.next)
3059                                                    {
3060                                                       if(prop.Set)
3061                                                       {
3062                                                          if(computed.instance._class && computed.instance._class.symbol &&
3063                                                             computed.instance._class.symbol.registered &&
3064                                                             eClass_IsDerived(computed.instance._class.symbol.registered, propertyClass))
3065                                                          {
3066                                                             ((void (*)(void *, void *))(void *)prop.Set)(instance, computed.instance.data);
3067
3068                                                             // This was saved in the control and shouldn't be freed by FreeExpression...
3069                                                             // (Not doing this anymore, incrementing refCount in pass15 instead)
3070                                                             /*if(propertyClass.type == normalClass)
3071                                                                computed.instance.data = null;*/
3072                                                          }
3073                                                       }
3074                                                    }
3075                                                    // MOVED THIS UP NOW THAT char * IS A NORMAL CLASS
3076                                                    else if(computed.type == stringExp && propertyClass.dataTypeString && strstr(propertyClass.dataTypeString, "char *"))
3077                                                    {
3078                                                       String temp = new char[strlen(computed.string)+1];
3079                                                       ReadString(temp, computed.string);
3080                                                       ((void (*)(void *, void *))(void *)prop.Set)(instance, temp);
3081                                                       delete temp;
3082                                                    }
3083                                                    else
3084                                                       propDef.variable = true;
3085
3086                                                    FreeExpression(computed);
3087                                                 }
3088                                                 else
3089                                                 {
3090                                                    Expression computed = CopyExpression(propDef.initializer.exp);
3091                                                    ComputeExpression(computed);
3092                                                    if(computed.isConstant)
3093                                                    {
3094                                                       //if(computed.type == memberExp) computed = computed.member.exp;
3095
3096                                                       if(computed.type == constantExp)
3097                                                       {
3098                                                          Operand value = GetOperand(computed);
3099                                                          DataValue valueData;
3100                                                          valueData.i64 = value.i64;
3101                                                          SetProperty(prop, instance, valueData);
3102                                                       }
3103                                                       else if(computed.type == stringExp && propertyClass.dataTypeString && strstr(propertyClass.dataTypeString, "char *"))
3104                                                       {
3105                                                          String temp = new char[strlen(computed.string)+1];
3106                                                          ReadString(temp, computed.string);
3107                                                          ((void (*)(void *, void *))(void *)prop.Set)(instance, temp);
3108                                                          delete temp;
3109                                                       }
3110                                                    }
3111                                                    else
3112                                                       propDef.variable = true;
3113
3114                                                    FreeExpression(computed);
3115                                                 }
3116                                              }
3117                                              else
3118                                                 propDef.variable = true;
3119                                           }
3120                                           else
3121                                           {
3122                                              Method method = eClass_FindMethod(regClass, id.string, this.privateModule);
3123                                              if(method && method.type == virtualMethod && propDef.initializer && propDef.initializer.type == expInitializer &&
3124                                                 propDef.initializer.exp && propDef.initializer.exp.type == identifierExp)
3125                                              {
3126                                                 ClassDef def;
3127                                                 // Maintain a list in FunctionDefinition of who is attached to it
3128                                                 for(def = _class.definitions->first; def; def = def.next)
3129                                                 {
3130                                                    if(def.type == functionClassDef)
3131                                                    {
3132                                                       ClassFunction function = def.function;
3133                                                       if(!strcmp(function.declarator.symbol.string, propDef.initializer.exp.identifier.string))
3134                                                       {
3135                                                          function.attached.Add(OldLink { data = method });
3136                                                       }
3137                                                    }
3138                                                 }
3139                                              }
3140                                           }
3141                                        }
3142                                     }
3143                                     break;
3144                                  }
3145                                  case declarationClassDef:
3146                                  {
3147                                     Declaration decl = def.decl;
3148                                     switch(decl.type)
3149                                     {
3150                                        case instDeclaration:
3151                                        {
3152                                           Instantiation inst = decl.inst;
3153                                           Class instClass = eSystem_FindClass(this.privateModule, inst._class.name);
3154                                           if(instClass && eClass_GetDesigner(instClass))
3155                                           {
3156                                              Instance control = eInstance_New(instClass);
3157                                              incref control;
3158
3159                                              object = ObjectInfo
3160                                              {
3161                                                 oClass = classObject;
3162                                                 instance = control;
3163                                                 instCode = inst;
3164                                              };
3165                                              classObject.instances.Add(object);
3166                                              if(inst.exp)
3167                                                 // TOCHECK: Why is this needed now?
3168                                                 object.name = CopyString((inst.exp.type == memberExp) ? inst.exp.member.member.string : inst.exp.identifier.string);
3169                                              def.object = object;
3170
3171                                              // if(object.name) { symbol = eList_Add(&curContext.symbols, sizeof(Symbol)); symbol.string = object.name; symbol.type = MkClassType(instClass.name); }
3172
3173                                              designer.CreateObject(control, object, false, classObject.instance);
3174                                              sheet.AddObject(object, object.name ? object.name : inst._class.name, typeData, false);
3175                                           }
3176                                           break;
3177                                        }
3178                                     }
3179                                     break;
3180                                  }
3181                               }
3182                            }
3183
3184                            // Second pass, process instantiation members
3185                            object = null;
3186                            for(def = _class.definitions->first; def; def = def.next)
3187                            {
3188                               switch(def.type)
3189                               {
3190                                  case declarationClassDef:
3191                                  {
3192                                     Declaration decl = def.decl;
3193                                     switch(decl.type)
3194                                     {
3195                                        case instDeclaration:
3196                                        {
3197                                           Instantiation inst = decl.inst;
3198                                           Class instClass = eSystem_FindClass(this.privateModule, inst._class.name);
3199                                           if(instClass && eClass_GetDesigner(instClass))
3200                                           {
3201                                              Instance control;
3202                                              object = object ? object.next : classObject.instances.first;
3203                                              control = object.instance;
3204
3205                                              if(inst.members)
3206                                              {
3207                                                 MembersInit members;
3208                                                 for(members = inst.members->first; members; members = members.next)
3209                                                 {
3210                                                    switch(members.type)
3211                                                    {
3212                                                       case dataMembersInit:
3213                                                       {
3214                                                          if(members.dataMembers)
3215                                                          {
3216                                                             MemberInit member;
3217                                                             DataMember curMember = null;
3218                                                             Class curClass = null;
3219                                                             DataMember subMemberStack[256];
3220                                                             int subMemberStackPos = 0;
3221
3222                                                             for(member = members.dataMembers->first; member; member = member.next)
3223                                                             {
3224                                                                bool found = false;
3225                                                                Identifier ident = member.identifiers ? member.identifiers->first : null;
3226                                                                if(ident)
3227                                                                {
3228                                                                   DataMember _subMemberStack[256];
3229                                                                   int _subMemberStackPos = 0;
3230                                                                   DataMember thisMember = (DataMember)eClass_FindDataMember(instClass, ident.string, privateModule, _subMemberStack, &_subMemberStackPos);
3231
3232                                                                   if(!thisMember)
3233                                                                   {
3234                                                                      thisMember = (DataMember)eClass_FindProperty(instClass, ident.string, privateModule);
3235                                                                   }
3236                                                                   if(thisMember && thisMember.memberAccess == publicAccess)
3237                                                                   {
3238                                                                      curMember = thisMember;
3239                                                                      curClass = curMember._class;
3240                                                                      memcpy(subMemberStack, _subMemberStack, sizeof(DataMember) * _subMemberStackPos);
3241                                                                      subMemberStackPos = _subMemberStackPos;
3242                                                                      found = true;
3243                                                                   }
3244                                                                }
3245                                                                else
3246                                                                {
3247                                                                   eClass_FindNextMember(instClass, &curClass, (DataMember *)&curMember, subMemberStack, &subMemberStackPos);
3248                                                                   if(curMember) found = true;
3249                                                                }
3250                                                                if(found && curMember.isProperty)
3251                                                                {
3252                                                                   Property prop = (Property) curMember;
3253                                                                   Class propertyClass = prop.dataTypeClass;
3254                                                                   if(!propertyClass)
3255                                                                      propertyClass = prop.dataTypeClass = eSystem_FindClass(this.privateModule, prop.dataTypeString);
3256
3257                                                                   if(prop.compiled && prop.Set && prop.Get && propertyClass && member.initializer && member.initializer.type == expInitializer && member.initializer.exp)
3258                                                                   {
3259                                                                      FreeType(member.initializer.exp.destType);
3260                                                                      member.initializer.exp.destType = MkClassType(propertyClass.name);
3261                                                                      if(propertyClass)
3262                                                                      {
3263                                                                         ProcessExpressionType(member.initializer.exp);
3264
3265                                                                         if(propertyClass.type == structClass || propertyClass.type == normalClass || propertyClass.type == noHeadClass)
3266                                                                         {
3267                                                                            Expression computed;
3268 #ifdef _DEBUG
3269                                                                            /*char debugExpString[4096];
3270                                                                            debugExpString[0] = '\0';
3271                                                                            PrintExpression(member.initializer.exp, debugExpString);*/
3272 #endif
3273                                                                            computed = CopyExpression(member.initializer.exp);
3274                                                                            if(computed)
3275                                                                            {
3276                                                                               ComputeExpression(computed);
3277
3278                                                                               if(computed.type == instanceExp && computed.isConstant && computed.isConstant)
3279                                                                               {
3280                                                                                  if(computed.instance.data)
3281                                                                                  {
3282                                                                                     if(computed.instance._class && computed.instance._class.symbol &&
3283                                                                                        computed.instance._class.symbol.registered &&
3284                                                                                        eClass_IsDerived(computed.instance._class.symbol.registered, propertyClass))
3285                                                                                     {
3286                                                                                        ((void (*)(void *, void *))(void *)prop.Set)(control, computed.instance.data);
3287
3288                                                                                        // This was saved in the control and shouldn't be freed by FreeExpression...
3289                                                                                        // (Not doing this anymore, incrementing refCount in pass15 instead)
3290                                                                                        /*if(propertyClass.type == normalClass)
3291                                                                                           computed.instance.data = null;*/
3292                                                                                     }
3293                                                                                  }
3294                                                                               }
3295                                                                               else if(computed.type == identifierExp)
3296                                                                               {
3297                                                                                  member.variable = true;
3298
3299                                                                                  if(eClass_GetDesigner(propertyClass))
3300                                                                                  //if(prop.Set)
3301                                                                                  {
3302                                                                                     char * name = computed.identifier.string;
3303                                                                                     if(!strcmp(name, "this"))
3304                                                                                     {
3305                                                                                        if(prop.Set)
3306                                                                                           ((void (*)(void *, void *))(void *)prop.Set)(control, instance);
3307                                                                                        member.variable = false;
3308                                                                                     }
3309                                                                                     else
3310                                                                                     {
3311                                                                                        ObjectInfo check;
3312                                                                                        for(check = classObject.instances.first; check; check = check.next)
3313                                                                                           if(check.name && !strcmp(name, check.name))
3314                                                                                           {
3315                                                                                              if(prop.Set)
3316                                                                                                 ((void (*)(void *, void *))(void *)prop.Set)(control, check.instance);
3317                                                                                              member.variable = false;
3318                                                                                              break;
3319                                                                                           }
3320                                                                                     }
3321                                                                                  }
3322                                                                               }
3323                                                                               else if(computed.type == memberExp)
3324                                                                               {
3325                                                                                  member.variable = true;
3326                                                                                  if(computed.member.exp.type == identifierExp)
3327                                                                                  {
3328                                                                                     char * name = computed.member.exp.identifier.string;
3329                                                                                     if(!strcmp(name, "this"))
3330                                                                                     {
3331                                                                                        char * name = computed.member.member.string;
3332                                                                                        {
3333                                                                                           ObjectInfo check;
3334                                                                                           for(check = classObject.instances.first; check; check = check.next)
3335                                                                                              if(check.name && !strcmp(name, check.name))
3336                                                                                              {
3337                                                                                                 if(prop.Set)
3338                                                                                                    ((void (*)(void *, void *))(void *)prop.Set)(control, check.instance);
3339                                                                                                 member.variable = false;
3340                                                                                                 break;
3341                                                                                              }
3342                                                                                        }
3343                                                                                     }
3344                                                                                     else
3345                                                                                     {
3346                                                                                        ObjectInfo check;
3347                                                                                        for(check = classObject.instances.first; check; check = check.next)
3348                                                                                        {
3349                                                                                           if(check.name && !strcmp(name, check.name))
3350                                                                                           {
3351                                                                                              Property getProperty = eClass_FindProperty(check.instance._class, computed.member.member.string, this.privateModule);
3352                                                                                              if(getProperty)
3353                                                                                              {
3354                                                                                                 DataValue value { };
3355                                                                                                 GetProperty(getProperty, check.instance, &value);
3356                                                                                                 SetProperty(prop, control, value);
3357                                                                                                 member.variable = false;
3358                                                                                              }
3359                                                                                              break;
3360                                                                                           }
3361                                                                                        }
3362                                                                                     }
3363                                                                                  }
3364                                                                               }
3365                                                                               // MOVED THIS UP NOW THAT char * IS A NORMAL CLASS
3366                                                                               else if(computed.isConstant && computed.type == stringExp && propertyClass.dataTypeString && strstr(propertyClass.dataTypeString, "char *"))
3367                                                                               {
3368                                                                                  String temp = new char[strlen(computed.string)+1];
3369                                                                                  ReadString(temp, computed.string);
3370                                                                                  ((void (*)(void *, void *))(void *)prop.Set)(control, temp);
3371                                                                                  delete temp;
3372                                                                               }
3373                                                                               else
3374                                                                                  member.variable = true;
3375
3376                                                                               FreeExpression(computed);
3377                                                                            }
3378                                                                         }
3379                                                                         else
3380                                                                         {
3381                                                                            Expression computed = CopyExpression(member.initializer.exp);
3382                                                                            if(computed)
3383                                                                            {
3384                                                                               ComputeExpression(computed);
3385                                                                               if(computed.isConstant)
3386                                                                               {
3387                                                                                  if(computed.type == constantExp && (!propertyClass.dataTypeString || strcmp(propertyClass.dataTypeString, "char *"))) //(strcmp(propertyClass.name, "char *") && (strcmp(propertyClass.name, "String"))))
3388                                                                                  {
3389                                                                                     if(!strcmp(propertyClass.dataTypeString, "float"))
3390                                                                                        ((void (*)(void *, float))(void *)prop.Set)(control, (float)strtod(computed.constant, null));
3391                                                                                     else if(!strcmp(propertyClass.dataTypeString, "double"))
3392                                                                                        ((void (*)(void *, double))(void *)prop.Set)(control, strtod(computed.constant, null));
3393                                                                                     else
3394                                                                                        ((void (*)(void *, int))(void *)prop.Set)(control, strtol(computed.constant, null, 0));
3395                                                                                  }
3396                                                                                  else if(computed.type == stringExp  && propertyClass.dataTypeString && strstr(propertyClass.dataTypeString, "char *"))
3397                                                                                  {
3398                                                                                     String temp = new char[strlen(computed.string)+1];
3399                                                                                     ReadString(temp, computed.string);
3400                                                                                     ((void (*)(void *, void *))(void *)prop.Set)(control, temp);
3401                                                                                     delete temp;
3402                                                                                  }
3403                                                                               }
3404                                                                               else
3405                                                                                  member.variable = true;
3406
3407                                                                               FreeExpression(computed);
3408                                                                            }
3409                                                                         }
3410                                                                      }
3411                                                                   }
3412                                                                   else
3413                                                                      member.variable = true;
3414                                                                }
3415                                                                else if(ident && member.initializer && member.initializer.type == expInitializer && member.initializer.exp &&
3416                                                                   member.initializer.exp.type == memberExp) // identifierExp
3417                                                                {
3418                                                                   Method method = eClass_FindMethod(instClass, ident.string, this.privateModule);
3419                                                                   if(method && method.type == virtualMethod)
3420                                                                   {
3421                                                                      ClassDef def;
3422                                                                      // Maintain a list in FunctionDefinition of who is attached to it
3423                                                                      for(def = _class.definitions->first; def; def = def.next)
3424                                                                      {
3425                                                                         if(def.type == functionClassDef)
3426                                                                         {
3427                                                                            ClassFunction function = def.function;
3428                                                                            Identifier id = (member.initializer.exp.type == memberExp) ? member.initializer.exp.member.member : member.initializer.exp.identifier;
3429                                                                            if(function.declarator && !strcmp(function.declarator.symbol.string, id.string))
3430                                                                            {
3431                                                                               function.attached.Add(OldLink { data = method });
3432                                                                               // Reference this particular instance?
3433                                                                            }
3434                                                                         }
3435                                                                      }
3436                                                                   }
3437                                                                }
3438                                                                id++;
3439                                                             }
3440                                                          }
3441                                                          break;
3442                                                       }
3443                                                    }
3444                                                 }
3445                                              }
3446
3447                                              designer.PostCreateObject(object.instance, object, false, classObject.instance);
3448                                              break;
3449                                           }
3450                                        }
3451                                        break;
3452                                     }
3453                                  }
3454                               }
3455                            }
3456                         }
3457
3458                         //designer.CreateObject(instance, classObject, true, null);
3459                         //sheet.AddObject(classObject, classObject.name ? classObject.name : _class._class.name, classType, false);
3460
3461                         designer.PostCreateObject(instance, classObject, true, null);
3462
3463                         //instance.state = Hidden;
3464                         //instance.Create();
3465                         //instance.SetState(Normal, true, 0);
3466                      }
3467                   }
3468                }
3469             }
3470          }
3471
3472          SetAST(null);
3473 #ifdef _TIMINGS
3474          printf("Class/Instance Processing took %.3f seconds\n", GetTime() - startTime);
3475 #endif
3476       }
3477
3478       // Restore Selection
3479       if(selectedClassName)
3480       {
3481          ObjectInfo oClass;
3482          for(oClass = classes.first; oClass; oClass = oClass.next)
3483          {
3484             if(!strcmp(oClass.name, selectedClassName))
3485             {
3486                this.oClass = oClass;
3487                break;
3488             }
3489          }
3490          delete selectedClassName;
3491       }
3492       if(this.oClass)
3493       {
3494          if(selectedName)
3495          {
3496             ObjectInfo check;
3497             int pos = 0;
3498
3499             for(check = this.oClass.instances.first; check; check = check.next)
3500             {
3501                if(check.name && !strcmp(check.name, selectedName))
3502                {
3503                   this.selected = check;
3504                   break;
3505                }
3506             }
3507             if(!check)
3508             {
3509                if(this.oClass.instances.first)
3510                   this.selected = this.oClass.instances.first;
3511                else
3512                   this.selected = this.oClass;
3513             }
3514          }
3515          else if(selectedPos == -1 || !this.oClass.instances.count)
3516             this.selected = this.oClass;
3517          else
3518          {
3519             ObjectInfo check;
3520             int pos = 0;
3521
3522             if(selectedPos > this.oClass.instances.count)
3523                selectedPos = 0;
3524             for(check = this.oClass.instances.first; check; check = check.next)
3525             {
3526                if(selectedPos == pos++)
3527                {
3528                   this.selected = check;
3529                   break;
3530                }
3531             }
3532          }
3533       }
3534       else
3535       {
3536          this.oClass = classes.first;
3537          this.selected = (this.oClass && this.oClass.instances.first) ? this.oClass.instances.first : this.oClass;
3538       }
3539       delete selectedName;
3540       SetSymbolsDir(null);
3541
3542       if(sheet.codeEditor == this)
3543          sheet.SelectObject(selected);
3544       Update(null);
3545
3546       codeModified = false;
3547
3548       // TESTING THIS TO NOT GET EMPTY PARAMETERS
3549       if(paramsShown)
3550       {
3551          InvokeParameters(false, false, false);
3552       }
3553
3554       editBox.SetSelPos(l1, y1, x1, l2, y2, x2);
3555
3556       reentrant = false;
3557
3558       updatingCode--;
3559
3560       ChangeWorkingDir(oldWorkDir);
3561 #ifdef _TIMINGS
3562       printf("Total FindClass time is %.3f seconds, out of which %.3f is in Ignore NS\n\n", findClassTotalTime, findClassIgnoreNSTotalTime);
3563       printf("Total CheckType time is %.3f seconds\n\n", checkTypeTotalTime);
3564       printf("Total MkExternalImport time is %.3f seconds\n\n", externalImportTotalTime);
3565       printf("Total FindSymbol time is %.3f seconds\n\n", findSymbolTotalTime);
3566       // printf("Total Class Members Find time is %.3f seconds\n\n", GetClassFindTime());
3567
3568       printf("Whole ParseCode function took %.3f seconds\n\n", GetTime() - parseCodeStart);
3569 #endif
3570       if(inUseDebug && ide.projectView)
3571          ide.debugger.EvaluateWatches();
3572
3573       delete pathBackup;
3574    }
3575
3576    void UpdateInstanceCodeClass(Class _class, ObjectInfo object, EditBoxStream f, Instance test, bool * prev, bool * lastIsMethod, DataMember * curMember, Class * curClass)
3577    {
3578       Property propIt;
3579       Window control = (Window)object.instance;
3580       ObjectInfo classObject = object.oClass;
3581
3582       if(_class.base && _class.base.type != systemClass) UpdateInstanceCodeClass(_class.base, object, f, test, prev, lastIsMethod, curMember, curClass);
3583
3584       if(!strcmp(_class.name, "DesignerBase")) return;
3585
3586       for(propIt = _class.membersAndProperties.first; propIt; propIt = propIt.next)
3587       {
3588          Property prop = eClass_FindProperty(object.instance._class, propIt.name, privateModule);
3589          if(prop && prop.isProperty && !prop.conversion && eClass_FindProperty(object.instance._class, prop.name, privateModule))
3590          {
3591             if(prop.Set && prop.Get && prop.dataTypeString && strcmp(prop.name, "name") && !Code_IsPropertyDisabled(object, prop.name) &&
3592                prop.compiled && (!prop.IsSet || prop.IsSet(control)))
3593             {
3594                Class dataType = prop.dataTypeClass;
3595                if(!dataType)
3596                   dataType = prop.dataTypeClass = eSystem_FindClass(this.privateModule, prop.dataTypeString);
3597
3598                if(dataType)
3599                {
3600                   if(dataType.type == structClass)
3601                   {
3602                      void * dataForm = new0 byte[dataType.structSize];
3603                      void * dataTest = new0 byte[dataType.structSize];
3604
3605                      ((void (*)(void *, void *))(void *)prop.Get)(control, dataForm);
3606                      ((void (*)(void *, void *))(void *)prop.Get)(test, dataTest);
3607
3608                      if((prop.IsSet && !prop.IsSet(test)) || ((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, dataForm, dataTest))
3609                      {
3610                         char tempString[1024] = "";
3611                         char * string = "";
3612                         bool needClass = true;
3613                         if(*prev)
3614                            f.Printf(", ");
3615
3616                         ((void (*)(void *, void *))(void *)prop.Set)(test, dataForm);
3617
3618                         string = ((char * (*)(void *, void *, void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, dataForm, tempString, null, &needClass);
3619
3620                         eClass_FindNextMember(_class, curClass, curMember, null, null);
3621                         if(*curMember != (DataMember)prop)
3622                            f.Printf("%s = ", prop.name);
3623
3624                         *curMember = (DataMember)prop;
3625                         *curClass = curMember->_class;
3626
3627                         if(needClass)
3628                            f.Printf("%c %s %c", /*dataType.name, */OpenBracket, string, CloseBracket);
3629                         else
3630                            f.Printf("%s", string);
3631                         *prev = true;
3632                      }
3633
3634                      delete dataForm;
3635                      delete dataTest;
3636                   }
3637                   else if(dataType.type == normalClass || dataType.type == noHeadClass)
3638                   {
3639                      void * dataForm, * dataTest;
3640
3641                      dataForm = ((void *(*)(void *))(void *)prop.Get)(control);
3642                      dataTest = ((void *(*)(void *))(void *)prop.Get)(test);
3643
3644                      if((prop.IsSet && !prop.IsSet(test)) || ((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, dataForm, dataTest))
3645                      {
3646                         char tempString[1024] = "";
3647                         char * string = "";
3648                         if(*prev)
3649                            f.Printf(", ");
3650
3651                         ((void (*)(void *, void *))(void *)prop.Set)(test, dataForm);
3652
3653                         eClass_FindNextMember(_class, curClass, curMember, null, null);
3654                         if(*curMember != (DataMember)prop)
3655                            f.Printf("%s = ", prop.name);
3656                         *curMember = (DataMember)prop;
3657                         *curClass = curMember->_class;
3658
3659                         if(eClass_GetDesigner(dataType))
3660                         {
3661                            if(eClass_IsDerived(classObject.instance._class, dataType) && classObject.instance == dataForm)
3662                            //if(!strcmp(classObject.instance._class.name, dataType.name) && classObject.instance == dataForm)
3663                               f.Printf("this", prop.name);
3664                            else
3665                            {
3666                               //ObjectInfo classObject;
3667                               //for(classObject = classes.first; classObject; classObject = classObject.next)
3668                               {
3669                                  ObjectInfo object;
3670
3671                                  for(object = classObject.instances.first; object; object = object.next)
3672                                  {
3673                                     if(!object.deleted && eClass_IsDerived(object.instance._class, dataType) && object.instance == dataForm && object.name)
3674                                     {
3675                                        f.Printf("%s", object.name);
3676                                        break;
3677                                     }
3678                                  }
3679
3680                                  if(!object)
3681                                  {
3682                                     bool needClass = true;
3683                                     string = ((char * (*)(void *, void *, void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, dataForm, tempString, null, &needClass);
3684                                     f.Printf("%s", string);
3685                                  }
3686                               }
3687                            }
3688                         }
3689                         else
3690                         {
3691                            bool needClass = true;
3692                            string = ((char * (*)(void *, void *, void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, dataForm, tempString, null, &needClass);
3693
3694                            if(!strcmp(dataType.dataTypeString, "char *"))
3695                            {
3696                               f.Printf("\"");
3697                               OutputString(f, string);
3698                               f.Puts("\"");
3699                            }
3700                            else if(needClass)
3701                               f.Printf("%c %s %c", /*dataType.name, */OpenBracket, string, CloseBracket);
3702                            else
3703                               f.Printf("%s", string);
3704                         }
3705                         *prev = true;
3706                         *lastIsMethod = false;
3707                      }
3708                   }
3709                   else
3710                   {
3711                      DataValue dataForm, dataTest;
3712
3713                      GetProperty(prop, control, &dataForm);
3714                      GetProperty(prop, test, &dataTest);
3715
3716                      if((prop.IsSet && !prop.IsSet(test)) || ((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, &dataForm, &dataTest))
3717                      {
3718                         char * string;
3719                         char tempString[1024] = "";
3720                         SetProperty(prop, test, dataForm);
3721
3722                         if(dataType.type != bitClass)
3723                         {
3724                            bool needClass = true;
3725
3726                            if(dataType.type == enumClass)
3727                            {
3728                               NamedLink value;
3729                               Class enumClass = eSystem_FindClass(privateModule, "enum");
3730                               EnumClassData e = ACCESS_CLASSDATA(dataType, enumClass);
3731
3732                               for(value = e.values.first; value; value = value.next)
3733                               {
3734                                  if((int)value.data == dataForm.i)
3735                                  {
3736                                     string = value.name;
3737                                     break;
3738                                  }
3739                               }
3740                            }
3741                            else
3742                               string = ((char * (*)(void *, void *, void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, &dataForm, tempString, null, &needClass);
3743
3744                            if(string && string[0])
3745                            {
3746                               if(*prev)
3747                                  f.Printf(", ");
3748
3749                               eClass_FindNextMember(_class, curClass, curMember, null, null);
3750                               if(*curMember != (DataMember)prop)
3751                                  f.Printf("%s = ", prop.name);
3752                               *curMember = (DataMember)prop;
3753                               *curClass = curMember->_class;
3754
3755                               if(!strcmp(dataType.dataTypeString, "float") && strchr(string, '.'))
3756                                  f.Printf("%sf", string);
3757                               else
3758                                  f.Printf("%s", string);
3759                               *prev = true;
3760                            }
3761                         }
3762                         else if(dataType.type == bitClass)
3763                         {
3764                            bool needClass = true;
3765
3766                            if(*prev) f.Printf(", ");
3767
3768                            eClass_FindNextMember(_class, curClass, curMember, null, null);
3769                            if(*curMember != (DataMember)prop)
3770                               f.Printf("%s = ", prop.name);
3771                            *curMember = (DataMember)prop;
3772                            *curClass = curMember->_class;
3773
3774                            string = ((char * (*)(void *, void *, void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, &dataForm.ui, tempString, null, &needClass);
3775                            if(needClass)
3776                               f.Printf("%c %s %c", /*dataType.name, */OpenBracket, string, CloseBracket);
3777                            else
3778                               f.Printf("%s", string);
3779                            *prev = true;
3780                            *lastIsMethod = false;
3781                         }
3782                      }
3783                   }
3784                }
3785             }
3786          }
3787       }
3788    }
3789
3790    int UpdateInstanceCode(EditBoxStream f, int position, Class regClass, ObjectInfo object, bool * firstObject, char ** text, int * textSize, int movedFuncIdLen, int movedFuncIdPos)
3791    {
3792       Instantiation inst = object.instCode;
3793       Window control = (Window)object.instance;
3794       bool prev = false;
3795       bool methodPresent = false;
3796       Class _class;
3797       bool lastIsMethod = true;
3798       ObjectInfo classObject = object.oClass;
3799
3800       if(inst)
3801       {
3802          if(object.deleted)
3803          {
3804             // Instance removed, delete it
3805             DeleteJunkBefore(f, inst.loc.start.pos, &position);
3806
3807             f.DeleteBytes(inst.loc.end.pos - inst.loc.start.pos + 1);
3808             position = inst.loc.end.pos + 1;
3809          }
3810          else
3811          {
3812             bool multiLine = false;
3813
3814             // Change the name
3815             // Check if it's an unnamed instance
3816             if(inst.exp)
3817             {
3818                f.Seek(inst.nameLoc.start.pos - position, current);
3819                f.DeleteBytes(inst.nameLoc.end.pos - inst.nameLoc.start.pos);
3820                position = inst.nameLoc.end.pos;
3821                if(object.name)
3822                   f.Printf(object.name);
3823                else
3824                {
3825                   char ch = 0;
3826                   f.Getc(&ch);
3827                   if(isspace(ch) && ch != '\n')
3828                   {
3829                      f.Seek(-1, current);
3830                      f.DeleteBytes(1);
3831                      position ++;
3832                   }
3833                }
3834             }
3835             else
3836             {
3837                int pos = inst.loc.start.pos; // + strlen(inst._class.name);
3838                char ch;
3839                f.Seek(pos - position, current);
3840                while(f.Getc(&ch))
3841                {
3842                   if(isspace(ch))
3843                   {
3844                      f.Seek(-1, current);
3845                      break;
3846                   }
3847                   pos++;
3848                }
3849
3850                if(object.name)
3851                {
3852                   f.Puts(" ");
3853                   f.Puts(object.name);
3854                }
3855                position = pos;
3856             }
3857
3858             if((this.methodAction == actionAddMethod || this.moveAttached) && this.selected == object)
3859                methodPresent = true;
3860
3861             for(;;)
3862             {
3863                char ch = 0;
3864                if(!f.Getc(&ch))
3865                   break;
3866                position++;
3867                if(ch == OpenBracket)
3868                   break;
3869                if(ch == '\n')
3870                   multiLine = true;
3871             }
3872
3873             // TODO: Simplify this?
3874             if(methodPresent)
3875             {
3876                if(!multiLine)
3877                {
3878                   int count = 0;
3879                   int toDelete = 0;
3880                   int toAdd = 0;
3881
3882                   f.Seek(-1, current);
3883                   f.Puts("\n   ");
3884                   f.Seek(1, current);
3885                   //f.Puts("\n");
3886
3887                   // Fix indentation
3888                   for(;;)
3889                   {
3890                      char ch = 0;
3891                      if(!f.Getc(&ch))
3892                         break;
3893                      position++;
3894                      if(ch == '\n') { toDelete = count; count = 0; }
3895                      else if(isspace(ch)) count++;
3896                      else
3897                      {
3898                         f.Seek(-1, current);
3899                         position--;
3900                         if(count > 6)
3901                         {
3902                            toDelete += count - 6;
3903                            count = 6;
3904                         }
3905                         else
3906                            toAdd = 6 - count;
3907                         break;
3908                      }
3909                   }
3910                   if(toDelete)
3911                   {
3912                      f.Seek(-toDelete-count, current);
3913                      f.DeleteBytes(toDelete);
3914                      f.Seek(count, current);
3915                   }
3916                   if(toAdd)
3917                   {
3918                      int c;
3919                      for(c = 0; c<toAdd; c++)
3920                         f.Putc(' ');
3921                   }
3922                }
3923             }
3924             else
3925                methodPresent = multiLine;
3926
3927             if(!prev)
3928                f.Printf(methodPresent ? "\n      " : " ");
3929
3930          }
3931       }
3932       else
3933       {
3934          // Instance not there, create a brand new one
3935          DeleteJunkBefore(f, position, &position);
3936          f.Printf(*firstObject ? "\n\n" : "\n");
3937          *firstObject = false;
3938
3939          if((this.methodAction == actionAddMethod || this.moveAttached) && this.selected == object)
3940             methodPresent = true;
3941
3942          if(methodPresent)
3943          {
3944             if(object.name)
3945                f.Printf("   %s %s\n   %c\n      ", control._class.name, object.name, OpenBracket);
3946             else
3947                f.Printf("   %s\n   %c\n      ", control._class.name, OpenBracket);
3948          }
3949          else
3950          {
3951             if(object.name)
3952                f.Printf("   %s %s %c ", control._class.name, object.name, OpenBracket);
3953             else
3954                f.Printf("   %s %c ", control._class.name, OpenBracket);
3955          }
3956       }
3957
3958       if(!object.deleted)
3959       {
3960          Instance test = eInstance_New(control._class);
3961          DataMember curMember = null;
3962          Class curClass = null;
3963          incref test;
3964
3965          UpdateInstanceCodeClass(control._class, object, f, test, &prev, &lastIsMethod, &curMember, &curClass);
3966
3967          delete test;
3968
3969          // Attach Method here
3970          if((this.methodAction == actionAttachMethod || this.methodAction == actionReattachMethod) && !this.moveAttached && this.selected == object)
3971          {
3972             if(prev) f.Printf(", ");
3973             f.Printf("%s = %s", this.method.name, function.declarator.symbol.string);
3974             prev = true;
3975          }
3976       }
3977
3978       if(inst && !object.deleted)
3979       {
3980          MembersInit members;
3981          Class instClass = eSystem_FindClass(this.privateModule, inst._class.name);
3982
3983          DeleteJunkBefore(f, position, &position);
3984
3985          // Instance already there, clear out the properties
3986          for(members = inst.members ? inst.members->first : null; members; members = members.next)
3987          {
3988             if(members.type == dataMembersInit)
3989             {
3990                MemberInit member;
3991
3992                if(members.dataMembers)
3993                {
3994                   bool keptMember = false;
3995                   MemberInit lastKept = null;
3996
3997                   for(member = members.dataMembers->first; member; member = member.next)
3998                   {
3999                      Identifier ident = member.identifiers ? member.identifiers->first : null;
4000                      bool deleted = false;
4001
4002                      // For now delete if it's not a method
4003                      if(!member.variable) // && ident)
4004                      {
4005                         if(!ident || !ident.next)
4006                         {
4007                            Property prop = ident ? eClass_FindProperty(instClass, ident.string, this.privateModule) : null;
4008                            if(!ident || prop)
4009                            {
4010                               f.Seek(member.loc.start.pos - position, current);
4011                               f.DeleteBytes(member.loc.end.pos - member.loc.start.pos);
4012                               position = member.loc.end.pos;
4013                               deleted = true;
4014                            }
4015                            else
4016                            {
4017                               Method method = eClass_FindMethod(instClass, ident.string, this.privateModule);
4018                               if(method && method.type == virtualMethod && member.initializer && member.initializer.type == expInitializer && member.initializer.exp &&
4019                                  member.initializer.exp.type == memberExp /*ExpIdentifier*/)
4020                               {
4021                                  if(((this.methodAction == actionDetachMethod || this.methodAction == actionReattachMethod) && this.method == method && this.selected == object) ||
4022                                     (this.methodAction == actionDeleteMethod && !strcmp(function.declarator.symbol.string, member.initializer.exp.identifier.string)))
4023                                  {
4024                                     f.Seek(member.loc.start.pos - position, current);
4025                                     f.DeleteBytes(member.loc.end.pos - member.loc.start.pos);
4026                                     position = member.loc.end.pos;
4027                                     deleted = true;
4028                                  }
4029                               }
4030                            }
4031                         }
4032                      }
4033                      if(!deleted)
4034                      {
4035                         keptMember = true;
4036                         lastKept = member;
4037
4038                         //f.Seek(member.loc.start.pos - position, current);
4039                         //position = member.loc.start.pos;
4040                         DeleteJunkBefore(f, member.loc.start.pos, &position);
4041                         if(prev) f.Printf(", ");
4042                         else if(keptMember) f.Printf(" ");
4043                         prev = false;
4044                      }
4045                   }
4046
4047                   if(!keptMember || !members.next)
4048                   {
4049                      char ch = 0;
4050                      int count = 0;
4051
4052                      if(keptMember && lastKept != members.dataMembers->last)
4053                      {
4054                         // Delete the comma
4055                         char ch;
4056                         int count = 0;
4057                         f.Seek(-1, current);
4058                         for(;f.Getc(&ch);)
4059                         {
4060                            if(ch == ',')
4061                            {
4062                               count++;
4063                               f.Seek(-1, current);
4064                               break;
4065                            }
4066                            else if(!isspace(ch))
4067                               break;
4068                            f.Seek(-2, current);
4069                            count++;
4070                         }
4071
4072                         if(ch == ',')
4073                            f.DeleteBytes(count);
4074                      }
4075
4076                      f.Seek(members.loc.end.pos - position, current);
4077                      f.Getc(&ch);
4078
4079                      if(ch == ';')
4080                      {
4081                         f.Seek(-1, current);
4082                         f.DeleteBytes(1);
4083                         position = members.loc.end.pos + 1;
4084                      }
4085                      else
4086                      {
4087                         f.Seek(-1, current);
4088                         position = members.loc.end.pos;
4089                      }
4090
4091                      if(keptMember)
4092                      {
4093                         prev = true;
4094                         lastIsMethod = false;
4095                      }
4096                   }
4097                   else
4098                   {
4099                      DeleteJunkBefore(f, position, &position);
4100                      f.Printf(" ");
4101
4102                      if(lastKept != members.dataMembers->last)
4103                      {
4104                         // Delete the comma
4105                         char ch;
4106                         int count = 0;
4107                         f.Seek(-1, current);
4108                         for(;f.Getc(&ch);)
4109                         {
4110                            if(ch == ',')
4111                            {
4112                               count++;
4113                               f.Seek(-1, current);
4114                               break;
4115                            }
4116                            else if(!isspace(ch))
4117                               break;
4118                            f.Seek(-2, current);
4119                            count++;
4120                         }
4121
4122                         if(ch == ',')
4123                            f.DeleteBytes(count);
4124                      }
4125                      else
4126                      {
4127                         f.Seek(members.loc.end.pos - position, current);
4128                         position = members.loc.end.pos;
4129                      }
4130                      /*
4131                      prev = false;
4132                      lastIsMethod = true;
4133                      */
4134                      prev = true;
4135                      lastIsMethod = false;
4136
4137                   }
4138                }
4139                else
4140                {
4141                   f.Seek(members.loc.end.pos - position, current);
4142                   position = members.loc.end.pos;
4143                   prev = false;
4144                   lastIsMethod = true;
4145                }
4146             }
4147             else if(members.type == methodMembersInit)
4148             {
4149                if(this.methodAction == actionDeleteMethod && members.function == function);
4150                else
4151                   methodPresent = true;
4152
4153                // Delete instance method here
4154                if((this.methodAction == actionDeleteMethod || (this.methodAction == actionDetachMethod && this.moveAttached)) &&
4155                   members.function == function)
4156                {
4157                   if(this.moveAttached && !*text)
4158                      GetLocText(editBox, f, position, &function.loc, text, textSize, Max((int)strlen(this.methodName) - movedFuncIdLen,0), 0);
4159
4160                   DeleteJunkBefore(f, members.loc.start.pos, &position);
4161                   f.DeleteBytes(members.loc.end.pos - members.loc.start.pos + 1);
4162                   position = members.loc.end.pos + 1;
4163                   f.Printf("\n");
4164                }
4165                else
4166                {
4167                   DeleteJunkBefore(f, position, &position);
4168                   if(!lastIsMethod)
4169                      f.Printf(";");
4170
4171                   DeleteJunkBefore(f, members.loc.start.pos, &position);
4172                   lastIsMethod = true;
4173                   f.Printf("\n\n      ");
4174                }
4175
4176                f.Seek(members.loc.end.pos - position, current);
4177                position = members.loc.end.pos;
4178             }
4179             DeleteJunkBefore(f, position, &position);
4180          }
4181       }
4182
4183       if(!object.deleted)
4184       {
4185          if(!methodPresent)
4186             f.Printf(" ");
4187
4188          if((this.methodAction == actionAddMethod || (this.moveAttached && (this.methodAction == actionAttachMethod || this.methodAction == actionReattachMethod))) && this.selected == object)
4189          {
4190             Method method = this.method;
4191             DeleteJunkBefore(f, position, &position);
4192             if(!lastIsMethod)
4193                f.Printf(";");
4194
4195             f.Printf("\n");
4196
4197             if(!method.dataType)
4198                method.dataType = ProcessTypeString(method.dataTypeString, false);
4199
4200             {
4201                Type dataType = method.dataType;
4202                Type returnType = dataType.returnType;
4203                Type param;
4204
4205                if(this.moveAttached)
4206                {
4207                   // Move function here:
4208                   int newLen = strlen(method.name);
4209
4210                   f.Printf("\n   ");
4211
4212                   if(!*text)
4213                      GetLocText(editBox, f, position, &function.loc, text, textSize, Max(newLen - movedFuncIdLen, 0), 3);
4214
4215                   // First change name of function
4216                   memmove(*text + movedFuncIdPos + newLen, *text + movedFuncIdPos + movedFuncIdLen, *textSize - movedFuncIdPos - movedFuncIdLen + 1);
4217                   *textSize += newLen - movedFuncIdLen;
4218                   memcpy(*text + movedFuncIdPos, method.name, newLen);
4219
4220                   // Second, tab right
4221                   {
4222                      int c;
4223                      for(c = 0; (*text)[c]; )
4224                      {
4225                         int i;
4226                         for(i = c; (*text)[i] && (*text)[i] != '\n'; i++);
4227                         if(i != c)
4228                         {
4229                            memmove((*text)+c+3, (*text)+c, *textSize+1-c);
4230                            (*text)[c] = (*text)[c+1] = (*text)[c+2] = ' ';
4231                            c += 3;
4232                            *textSize += 3;
4233                         }
4234                         for(; (*text)[c] && (*text)[c] != '\n'; c++);
4235                         if((*text)[c]) c++;
4236                      }
4237                   }
4238
4239                   f.Puts((*text));
4240                   f.Printf("\n");
4241                }
4242                else
4243                {
4244                   Class moduleClass = eSystem_FindClass(this.privateModule, "Module");
4245
4246                   // ADDING METHOD HERE
4247                   f.Printf("\n      ");
4248                   OutputType(f, returnType, false);
4249
4250                   f.Printf(" ");
4251                   if(dataType.thisClass)
4252                   {
4253                      if(!eClass_IsDerived(regClass, dataType.thisClass.registered) && !dataType.classObjectType)     // Just fixed this... was backwards.
4254                      {
4255                         if(dataType.thisClass.shortName)
4256                            f.Printf(dataType.thisClass.shortName);
4257                         else
4258                            f.Printf(dataType.thisClass.string);
4259                         f.Printf("::");
4260                      }
4261                   }
4262                   f.Printf(method.name);
4263                   f.Printf("(");
4264                   for(param = dataType.params.first; param; param = param.next)
4265                   {
4266                      OutputType(f, param, true);
4267                      if(param.next)
4268                         f.Printf(", ");
4269                   }
4270                   f.Printf(")\n");
4271                   f.Printf("      %c\n\n", OpenBracket);
4272
4273                   if(control._class._vTbl[method.vid] == moduleClass._vTbl[__ecereVMethodID___ecereNameSpace__ecere__com__Module_OnLoad]) // Temp Check for DefaultFunction
4274                   {
4275                      if(returnType.kind == classType && !strcmp(returnType._class.string, "bool"))
4276                         f.Printf("         return true;\n");
4277                      else if(returnType.kind != voidType)
4278                         f.Printf("         return 0;\n");
4279                   }
4280                   else
4281                   {
4282                      f.Printf("         ");
4283                      if(returnType.kind != voidType)
4284                         f.Printf("return ");
4285                      f.Printf("%s::%s(", control._class.name, method.name);
4286                      for(param = dataType.params.first; param; param = param.next)
4287                      {
4288                         if(param.prev) f.Printf(", ");
4289                         if(param.kind != voidType)
4290                            f.Printf(param.name);
4291                      }
4292                      f.Printf(");\n");
4293                   }
4294                   f.Printf("      %c\n", CloseBracket);
4295                }
4296             }
4297          }
4298       }
4299
4300       if(!object.instCode)
4301       {
4302          if(methodPresent)
4303             f.Printf("   %c;\n", CloseBracket);
4304          else
4305             f.Printf("%c;\n", CloseBracket);
4306       }
4307       else if(!object.deleted)
4308       {
4309          // Turn this into a multiline instance when adding a method
4310          DeleteJunkBefore(f, inst.loc.end.pos-1, &position);
4311
4312          f.Printf(methodPresent ? "\n   " : " ");
4313
4314          f.Seek(inst.loc.end.pos + 1 - position, current);
4315          position = inst.loc.end.pos + 1;
4316       }
4317       return position;
4318    }
4319
4320    void OutputClassProperties(Class _class, ObjectInfo classObject, EditBoxStream f, Instance test)
4321    {
4322       Property propIt;
4323       Class regClass = eSystem_FindClass(privateModule, classObject.name);
4324
4325       if(_class.base && _class.base.type != systemClass) OutputClassProperties(_class.base, classObject, f, test);
4326
4327       for(propIt = _class.membersAndProperties.first; propIt; propIt = propIt.next)
4328       {
4329          Property prop = eClass_FindProperty(selected.instance._class, propIt.name, privateModule);
4330          if(prop && prop.isProperty && !prop.conversion)
4331          {
4332             if(prop.Set && prop.Get && prop.dataTypeString && strcmp(prop.name, "name") && !Code_IsPropertyDisabled(classObject, prop.name) &&
4333                (!prop.IsSet || prop.IsSet(classObject.instance)))
4334             {
4335                Class dataType = prop.dataTypeClass;
4336                char tempString[1024] = "";
4337                char * string;
4338                bool specify = false;
4339                DataMember member;
4340
4341                member = eClass_FindDataMember(regClass, prop.name, privateModule, null, null);
4342                if(member && member._class == regClass)
4343                   specify = true;
4344
4345                if(!dataType)
4346                   dataType = prop.dataTypeClass = eSystem_FindClass(this.privateModule, prop.dataTypeString);
4347
4348                if(dataType && dataType.type == structClass)
4349                {
4350                   void * dataForm = new0 byte[dataType.structSize];
4351                   void * dataTest = new0 byte[dataType.structSize];
4352
4353                   ((void (*)(void *, void *))(void *)prop.Get)(classObject.instance, dataForm);
4354                   ((void (*)(void *, void *))(void *)prop.Get)(test, dataTest);
4355
4356                   if(((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, dataForm, dataTest))
4357                   {
4358                      bool needClass = true;
4359
4360                      string = ((char * (*)(void *, void *, void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, dataForm, tempString, null, &needClass);
4361                      ((void (*)(void *, void *))(void *)prop.Set)(test, dataForm);
4362                      if(needClass)
4363                         f.Printf("\n   %s%s = %c %s %c;", specify ? "property::" : "", prop.name, /*dataType.name, */OpenBracket, string, CloseBracket);
4364                      else
4365                         f.Printf("\n   %s%s = %s;", specify ? "property::" : "", prop.name, string);
4366                   }
4367                   delete dataForm;
4368                   delete dataTest;
4369                }
4370                else if(dataType && (dataType.type == normalClass || dataType.type == noHeadClass))
4371                {
4372                   void * dataForm, * dataTest;
4373
4374                   dataForm = ((void *(*)(void *))(void *)prop.Get)(classObject.instance);
4375                   dataTest = ((void *(*)(void *))(void *)prop.Get)(test);
4376
4377                   if(((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, dataForm, dataTest))
4378                   {
4379                      char tempString[1024] = "";
4380                      char * string;
4381                      ((void (*)(void *, void *))(void *)prop.Set)(test, dataForm);
4382
4383                      if(eClass_IsDerived(classObject.instance._class, dataType) && classObject.instance == dataForm)
4384                      {
4385                         // Shouldn't go here ...
4386                         f.Printf("\n   %s%s = this;", specify ? "property::" : "", prop.name);
4387                      }
4388                      else
4389                      {
4390                         bool needClass = true;
4391
4392                         string = ((char * (*)(void *, void *, void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, dataForm, tempString, null, &needClass);
4393
4394                         if(!strcmp(dataType.dataTypeString, "char *"))
4395                         {
4396                            f.Printf("\n   %s%s = \"", specify ? "property::" : "", prop.name);
4397                            OutputString(f, string);
4398                            f.Puts("\";");
4399                         }
4400                         else if(needClass)
4401                            f.Printf("\n   %s%s = %c %s %c;", specify ? "property::" : "", prop.name, /*dataType.name, */OpenBracket, string, CloseBracket);
4402                         else
4403                            f.Printf("\n   %s%s = %s;", specify ? "property::" : "", prop.name, string);
4404                      }
4405                   }
4406                }
4407                else if(dataType)
4408                {
4409                   DataValue dataForm, dataTest;
4410
4411                   GetProperty(prop, classObject.instance, &dataForm);
4412                   GetProperty(prop, test, &dataTest);
4413
4414                   if(((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, &dataForm, &dataTest))
4415                   {
4416                      SetProperty(prop, test, dataForm);
4417                      if(dataType.type == bitClass)
4418                      {
4419                         bool needClass = true;
4420                         string = ((char * (*)(void *, void *, void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, &dataForm, tempString, null, &needClass);
4421                         if(needClass)
4422                            f.Printf("\n   %s%s = %c %s %c;", specify ? "property::" : "", prop.name, /*dataType.name, */OpenBracket, string, CloseBracket);
4423                         else if(string[0])
4424                            f.Printf("\n   %s%s = %s;", specify ? "property::" : "", prop.name, string);
4425                      }
4426                      else
4427                      {
4428                         bool needClass = true;
4429                         if(dataType.type == enumClass)
4430                         {
4431                            NamedLink value;
4432                            Class enumClass = eSystem_FindClass(privateModule, "enum");
4433                            EnumClassData e = ACCESS_CLASSDATA(dataType, enumClass);
4434
4435                            for(value = e.values.first; value; value = value.next)
4436                            {
4437                               if((int)value.data == dataForm.i)
4438                               {
4439                                  string = value.name;
4440                                  break;
4441                               }
4442                            }
4443                         }
4444                         else
4445                            string = ((char * (*)(void *, void *, void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, &dataForm, tempString, null, &needClass);
4446                         if(!strcmp(dataType.dataTypeString, "float") && strchr(string, '.'))
4447                            f.Printf("\n   %s%s = %sf;", specify ? "property::" : "", prop.name, string);
4448                         else if(string[0])
4449                            f.Printf("\n   %s%s = %s;", specify ? "property::" : "", prop.name, string);
4450                      }
4451                   }
4452                }
4453             }
4454          }
4455       }
4456    }
4457
4458    void UpdateFormCode()
4459    {
4460       if(!this) return;
4461       if(!parsing) return;
4462
4463       updatingCode++;
4464       if(codeModified)
4465       {
4466          ParseCode();
4467       }
4468       else if(formModified)
4469       {
4470          EditBoxStream f { editBox = editBox };
4471          int position = 0;
4472          char * text = null;
4473          int textSize;
4474          Identifier movedFuncId;
4475          int movedFuncIdLen = 0, movedFuncIdPos = 0;
4476          ObjectInfo classObject;
4477
4478            updatingCode++;
4479
4480          if(moveAttached)
4481          {
4482             movedFuncId = GetDeclId(function.declarator);
4483             movedFuncIdLen = movedFuncId.loc.end.pos - movedFuncId.loc.start.pos;
4484             movedFuncIdPos = movedFuncId.loc.start.pos - function.loc.start.pos;
4485          }
4486
4487          for(classObject = classes.first; classObject; classObject = classObject.next)
4488          {
4489             Class _class;
4490             ClassDefinition classDef = classObject.classDefinition;
4491             Class regClass = eSystem_FindClass(this.privateModule, ((Specifier)classDef.baseSpecs->first).name);
4492             Instance test;
4493             ClassDef def;
4494             bool firstObject = true;
4495             ObjectInfo object = classObject.instances.first;
4496             bool lastIsDecl = false;
4497
4498             if(!classObject.modified) continue;
4499
4500             test = eInstance_New(regClass);
4501             incref test;
4502
4503             // Put it in the same desktop window...
4504             designer.PrepareTestObject(test);
4505
4506             //f.Printf("class %s : %s\n", classObject.name, classObject.oClass.name);
4507             //f.Printf("%c\n\n", OpenBracket);
4508
4509             // Change the _class name
4510             f.Seek(classDef.nameLoc.start.pos - position, current);
4511             f.DeleteBytes(classDef.nameLoc.end.pos - classDef.nameLoc.start.pos);
4512             f.Printf(classObject.name);
4513             position = classDef.nameLoc.end.pos;
4514
4515             {
4516                // Go to block start, delete all until no white space, put \n
4517                char ch;
4518                int count = 0;
4519                int back = 0;
4520                f.Seek(classDef.blockStart.end.pos - position, current);
4521                position = classDef.blockStart.end.pos;
4522
4523                for(; f.Getc(&ch); count++)
4524                {
4525                   if(!isspace(ch))
4526                   {
4527                      f.Seek(-1, current);
4528                      break;
4529                   }
4530
4531                   if(ch == '\n')
4532                      back = 0;
4533                   else
4534                      back++;
4535                }
4536
4537                f.Seek(-count, current);
4538
4539                f.DeleteBytes(count-back);
4540                //f.Printf("\n");
4541                position += count-back;
4542             }
4543
4544             // Output properties
4545             OutputClassProperties(classObject.instance._class, classObject, f, test);
4546
4547             for(def = classDef.definitions->first; def; def = def.next)
4548             {
4549                switch(def.type)
4550                {
4551                   case defaultPropertiesClassDef:
4552                   {
4553                      bool keptMember = false;
4554                      MemberInit propDef;
4555                      MemberInit lastKept = null;
4556
4557                      lastIsDecl = false;
4558                      DeleteJunkBefore(f, def.loc.start.pos, &position);
4559                      f.Printf("\n   ");
4560
4561                      for(propDef = def.defProperties->first; propDef; propDef = propDef.next)
4562                      {
4563                         Identifier ident = propDef.identifiers->first;
4564                         bool deleted = false;
4565
4566                         // For now delete if it's a prop
4567                         if(!propDef.variable && ident)
4568                         {
4569                            if(!ident.next)
4570                            {
4571                               Property prop = eClass_FindProperty(regClass, ident.string, this.privateModule);
4572                               if(prop)
4573                               {
4574                                  f.Seek(propDef.loc.start.pos - position, current);
4575                                  f.DeleteBytes(propDef.loc.end.pos - propDef.loc.start.pos);
4576                                  position = propDef.loc.end.pos;
4577                                  deleted = true;
4578                               }
4579                               else
4580                               {
4581                                  Method method = eClass_FindMethod(regClass, ident.string, this.privateModule);
4582                                  if(method && method.type == virtualMethod && propDef.initializer && propDef.initializer.type == expInitializer && propDef.initializer.exp && propDef.initializer.exp.type == identifierExp)
4583                                  {
4584                                     if(((methodAction == actionDetachMethod || methodAction == actionReattachMethod) && method == this.method && selected == classObject) ||
4585                                        (methodAction == actionDeleteMethod && !strcmp(function.declarator.symbol.string, propDef.initializer.exp.identifier.string)))
4586                                     {
4587                                        f.Seek(propDef.loc.start.pos - position, current);
4588                                        f.DeleteBytes(propDef.loc.end.pos - propDef.loc.start.pos);
4589                                        position = propDef.loc.end.pos;
4590                                        deleted = true;
4591                                     }
4592                                  }
4593                               }
4594                            }
4595                         }
4596                         if(!deleted)
4597                         {
4598                            keptMember = true;
4599                            lastKept = propDef;
4600                         }
4601                      }
4602
4603                      if(!keptMember)
4604                      {
4605                         char ch = 0;
4606                         int count = 0;
4607                         f.Seek(def.loc.end.pos - position - 1, current);
4608                         f.Getc(&ch);
4609
4610                         if(ch == ';')
4611                         {
4612                            f.Seek(-1, current);
4613                            f.DeleteBytes(1);
4614                         }
4615                         position = def.loc.end.pos;
4616                      }
4617                      else
4618                      {
4619                         if(lastKept != def.defProperties->last)
4620                         {
4621                            char ch;
4622                            int count = 0;
4623
4624                            f.Seek(-1, current);
4625                            for(;f.Getc(&ch);)
4626                            {
4627                               if(ch == ',')
4628                               {
4629                                  count++;
4630                                  f.Seek(-1, current);
4631                                  break;
4632                               }
4633                               else if(!isspace(ch))
4634                                  break;
4635                               f.Seek(-2, current);
4636                               count++;
4637                            }
4638
4639                            if(ch == ',')
4640                               f.DeleteBytes(count);
4641                         }
4642                         else
4643                         {
4644                            f.Seek(def.loc.end.pos - position, current);
4645                            position = def.loc.end.pos;
4646                         }
4647                      }
4648                      break;
4649                   }
4650                   case declarationClassDef:
4651                   {
4652                      Declaration decl = def.decl;
4653
4654                      if(decl.type == instDeclaration)
4655                      {
4656                         if(def.object/* && ((ObjectInfo)def.object).modified*/)
4657                         {
4658                            while(def.object && object != def.object)
4659                            {
4660                               if(object /*&& ((ObjectInfo)def.object).modified*/)
4661                                  position = UpdateInstanceCode(f, position, regClass, object, &firstObject, &text, &textSize, movedFuncIdLen, movedFuncIdPos);
4662                               object = object.next;
4663                            }
4664
4665                            DeleteJunkBefore(f, def.loc.start.pos, &position);
4666                            f.Printf(firstObject ? "\n\n   " : "\n   ");
4667                            firstObject = false;
4668
4669                            if(def.object && ((ObjectInfo)def.object).modified)
4670                               position = UpdateInstanceCode(f, position, regClass, def.object, &firstObject, &text, &textSize, movedFuncIdLen, movedFuncIdPos);
4671
4672                            object = object ? object.next : null;
4673                         }
4674                         else
4675                         {
4676                            DeleteJunkBefore(f, def.loc.start.pos, &position);
4677                            f.Printf(firstObject ? "\n\n   " : "\n   ");
4678                            firstObject = false;
4679                         }
4680                         lastIsDecl = false;
4681                      }
4682                      else
4683                      {
4684                         DeleteJunkBefore(f, def.loc.start.pos, &position);
4685                         f.Printf(lastIsDecl ? "\n   " : "\n\n   ");
4686                         lastIsDecl = true;
4687                      }
4688                      break;
4689                   }
4690                   case functionClassDef:
4691                   {
4692                      // TESTING IF THIS IS GOOD ENOUGH FOR GENERATED FUNCTION...
4693                      if(!def.function.body) continue;
4694
4695                      lastIsDecl = false;
4696
4697                      DeleteJunkBefore(f, def.loc.start.pos, &position);
4698                      f.Printf("\n\n   ");
4699
4700                      // Delete _class methods
4701                      if((methodAction == actionDeleteMethod || (moveAttached && selected != classObject)) &&
4702                         def.function == function)
4703                      {
4704                         char ch;
4705                         int count = 0;
4706
4707                         if(moveAttached && !text)
4708                         {
4709                            GetLocText(editBox, f, position, &function.loc, &text, &textSize, Max((int)strlen(methodName) - movedFuncIdLen,0), 3);
4710                         }
4711
4712                         f.Seek(def.loc.end.pos - position, current);
4713                         for(; f.Getc(&ch); count++)
4714                         {
4715                            if(!isspace(ch))
4716                            {
4717                               f.Seek(-1, current);
4718                               break;
4719                            }
4720                         }
4721                         f.Seek(def.loc.start.pos - def.loc.end.pos - count, current);
4722
4723                         f.DeleteBytes(def.loc.end.pos - def.loc.start.pos + count);
4724                         position = def.loc.end.pos + count;
4725                      }
4726
4727                      // In case of detaching methods in the _class, simply rename the method
4728                      if(methodAction == actionDetachMethod && moveAttached && selected == classObject && function == def.function)
4729                      {
4730                         f.Seek(function.loc.start.pos + movedFuncIdPos - position, current);
4731                         f.DeleteBytes(movedFuncIdLen);
4732                         f.Puts(methodName);
4733                         position = function.loc.start.pos + movedFuncIdPos + movedFuncIdLen;
4734                      }
4735
4736                      if((methodAction == actionAttachMethod || methodAction == actionReattachMethod) && selected == classObject && moveAttached &&
4737                         function == def.function)
4738                      {
4739                         // In case of attaching methods in the _class, simply rename the method
4740                         f.Seek(function.loc.start.pos + movedFuncIdPos - position, current);
4741                         position = function.loc.start.pos + movedFuncIdPos;
4742                         f.DeleteBytes(movedFuncIdLen);
4743                         if(method.dataType.thisClass)
4744                            f.Printf("%s::", method.dataType.thisClass.string);
4745                         f.Puts(method.name);
4746                         position += movedFuncIdLen;
4747                      }
4748                      break;
4749                   }
4750                   default:
4751                      DeleteJunkBefore(f, def.loc.start.pos, &position);
4752                      if(def.type == memberAccessClassDef)
4753                      {
4754                         f.Printf("\n\n");
4755                         firstObject = false;
4756                         lastIsDecl = true;
4757                      }
4758                      else
4759                      {
4760                         f.Printf("\n   ");
4761                         lastIsDecl = false;
4762                      }
4763                }
4764
4765                f.Seek(def.loc.end.pos - position, current);
4766                position = def.loc.end.pos;
4767             }
4768
4769             // Output attached methods
4770             if((methodAction == actionAttachMethod || methodAction == actionReattachMethod) && selected == classObject && !moveAttached)
4771             {
4772                DeleteJunkBefore(f, position, &position);
4773                f.Printf("\n   %s = %s;\n", method.name, function.declarator.symbol.string);
4774             }
4775
4776             // ********** INSTANCES ***************
4777             for(; object; object = object.next)
4778             {
4779                if(!object.instCode)
4780                {
4781                   position = UpdateInstanceCode(f, position, regClass, object, &firstObject, &text, &textSize, movedFuncIdLen, movedFuncIdPos);
4782                }
4783             }
4784
4785             DeleteJunkBefore(f, position, &position);
4786
4787             // ****************** METHODS ***********************
4788             if(methodAction == actionDetachMethod && moveAttached && classObject == oClass)
4789             {
4790                // If detaching an instance method
4791                if(selected != classObject)
4792                {
4793                   int newLen = strlen(methodName);
4794
4795                   if(!text)
4796                      GetLocText(editBox, f, position, &function.loc, &text, &textSize, Max(newLen - movedFuncIdLen,0), 0);
4797                   // Tab selection left
4798                   {
4799                      int c;
4800                      for(c = 0; text[c]; )
4801                      {
4802                         int start = c, i;
4803                         for(i = 0; i<3 && text[c] == ' '; i++, c++);
4804                         memmove(text+start, text+start+i, textSize+1-start-i);
4805                         textSize -= i;
4806                         c -= i;
4807                         for(; text[c] && text[c] != '\n'; c++);
4808                         if(text[c]) c++;
4809                      }
4810                   }
4811
4812                   // Rename function
4813                   memmove(text + movedFuncIdPos + newLen, text + movedFuncIdPos + movedFuncIdLen, textSize - movedFuncIdPos - movedFuncIdLen + 1);
4814                   textSize += newLen - movedFuncIdLen;
4815                   memcpy(text + movedFuncIdPos, methodName, newLen);
4816
4817                   f.Printf("\n\n   ");
4818                   f.Puts(text);
4819                }
4820             }
4821
4822             if(methodAction == actionAddMethod && selected == classObject)
4823             {
4824                Method method = this.method;
4825
4826                if(!method.dataType)
4827                   method.dataType = ProcessTypeString(method.dataTypeString, false);
4828
4829                // ADDING METHOD HERE
4830                {
4831                   Type dataType = method.dataType;
4832                   Type returnType = dataType.returnType;
4833                   Type param;
4834                   Class moduleClass = eSystem_FindClass(this.privateModule, "Module");
4835
4836                   f.Printf("\n\n");
4837                   f.Printf("   ");
4838                   OutputType(f, returnType, false);
4839
4840                   f.Printf(" ");
4841                   if(dataType.thisClass && !dataType.classObjectType)
4842                   {
4843                      if(dataType.thisClass.shortName)
4844                         f.Printf(dataType.thisClass.shortName);
4845                      else
4846                         f.Printf(dataType.thisClass.string);
4847                      f.Printf("::");
4848                   }
4849                   f.Printf(method.name);
4850                   f.Printf("(");
4851                   for(param = dataType.params.first; param; param = param.next)
4852                   {
4853                      OutputType(f, param, true);
4854                      if(param.next)
4855                         f.Printf(", ");
4856                   }
4857                   f.Printf(")\n");
4858                   f.Printf("   %c\n\n", OpenBracket);
4859
4860                   if(test._class._vTbl[method.vid] == moduleClass._vTbl[__ecereVMethodID___ecereNameSpace__ecere__com__Module_OnLoad]) // Temp Check for DefaultFunction
4861                   {
4862                      if(returnType && returnType.kind == classType && !strcmp(returnType._class.string, "bool"))
4863                         f.Printf("      return true;\n");
4864                      else if(returnType && returnType.kind != voidType)
4865                         f.Printf("      return 0;\n");
4866                   }
4867                   else
4868                   {
4869                      f.Printf("      ");
4870                      if(returnType.kind != voidType)
4871                         f.Printf("return ");
4872                      {
4873                         char * name = ((Specifier)classDef.baseSpecs->first).name;
4874                         Symbol _class = FindClass(name);
4875                         f.Printf("%s::%s(", (_class && _class.registered) ? _class.registered.name : name, method.name);
4876                      }
4877                      for(param = dataType.params.first; param; param = param.next)
4878                      {
4879                         if(param.prev) f.Printf(", ");
4880                         if(param.kind != voidType)
4881                            f.Printf(param.name);
4882                      }
4883                      f.Printf(");\n");
4884                   }
4885
4886                   f.Printf("   %c", CloseBracket);
4887                }
4888             }
4889
4890             DeleteJunkBefore(f, classDef.loc.end.pos-1, &position);
4891             f.Printf("\n");
4892
4893             delete test;
4894          }
4895
4896          updatingCode--;
4897          delete f;
4898
4899          ParseCode();
4900          delete text;
4901
4902          // TOFIX: Patch for a glitch where clicking at the end of the view seems one line off. No idea what could be going on?
4903          editBox.OnVScroll(setRange, editBox.scroll.y, 0);
4904       }
4905
4906       updatingCode--;
4907       codeModified = false;
4908       formModified = false;
4909       methodAction = 0;
4910       moveAttached = false;
4911       function = null;
4912       method = null;
4913    }
4914
4915    int FindMethod(char * methodName /*Method method*/, ClassFunction*functionPtr, Location propLoc)
4916    {
4917       int found = 0;
4918       ClassFunction function = null;
4919       if(methodName)
4920       {
4921          ObjectInfo object = this.selected;
4922
4923          if(object && object == this.oClass)
4924          {
4925             ClassDefinition classDef = object.oClass.classDefinition;
4926             ClassDef def;
4927             if(classDef && classDef.definitions)
4928             {
4929                for(def = classDef.definitions->first; def; def = def.next)
4930                {
4931                   if(def.type == functionClassDef && def.function.declarator)
4932                   {
4933                      if(!strcmp(def.function.declarator.symbol.string, methodName))
4934                      {
4935                         function = def.function;
4936                         found = 1;
4937                         break;
4938                      }
4939                   }
4940                   else if(def.type == defaultPropertiesClassDef)
4941                   {
4942                      MemberInit propDef;
4943
4944                      for(propDef = def.defProperties->first; propDef; propDef = propDef.next)
4945                      {
4946                         Identifier ident = propDef.identifiers ? propDef.identifiers->first : null;
4947                         if(ident && !ident.next)
4948                         {
4949                            if(!strcmp(ident.string, methodName) && propDef.initializer && propDef.initializer.type == expInitializer && propDef.initializer.exp && propDef.initializer.exp.type == identifierExp)
4950                            {
4951                               found = 2;
4952                               if(propLoc != null)
4953                                  propLoc = propDef.loc;
4954                               if(functionPtr)
4955                               {
4956                                  ClassDefinition classDef = object.oClass.classDefinition;
4957                                  ClassDef def;
4958                                  if(classDef.definitions)
4959                                  {
4960                                     for(def = classDef.definitions->first; def; def = def.next)
4961                                     {
4962                                        if(def.type == functionClassDef)
4963                                        {
4964                                           if(!strcmp(def.function.declarator.symbol.string, propDef.initializer.exp.identifier.string))
4965                                           {
4966                                              function = def.function;
4967                                              break;
4968                                           }
4969                                        }
4970                                     }
4971                                     if(function) break;
4972                                  }
4973                               }
4974                               else
4975                                  break;
4976                            }
4977                         }
4978                      }
4979                   }
4980                }
4981             }
4982          }
4983          else if(object)
4984          {
4985             Instantiation inst = object.instCode;
4986
4987             // Check here to see if the method already exists, no need to call ModifyCode in that case
4988             if(inst && inst.members)
4989             {
4990                MembersInit members;
4991                for(members = inst.members->first; members; members = members.next)
4992                {
4993                   switch(members.type)
4994                   {
4995                      case dataMembersInit:
4996                      {
4997                         if(members.dataMembers)
4998                         {
4999                            MemberInit member;
5000                            for(member = members.dataMembers->first; member; member = member.next)
5001                            {
5002                               Identifier ident = member.identifiers ? member.identifiers->first : null;
5003                               if(ident && !ident.next)
5004                               {
5005                                  if(!strcmp(ident.string, methodName) && member.initializer && member.initializer.type == expInitializer && member.initializer.exp && member.initializer.exp.type == memberExp /*ExpIdentifier*/)
5006                                  {
5007                                     found = 2;
5008                                     if(propLoc != null)
5009                                        propLoc = member.loc;
5010                                     if(functionPtr)
5011                                     {
5012                                        ClassDefinition classDef = object.oClass.classDefinition;
5013                                        ClassDef def;
5014                                        if(classDef.definitions)
5015                                        {
5016                                           for(def = classDef.definitions->first; def; def = def.next)
5017                                           {
5018                                              if(def.type == functionClassDef)
5019                                              {
5020                                                 if(def.function.declarator && !strcmp(def.function.declarator.symbol.string, member.initializer.exp.identifier.string))
5021                                                 {
5022                                                    function = def.function;
5023                                                    break;
5024                                                 }
5025                                              }
5026                                           }
5027                                           if(function) break;
5028                                        }
5029                                        if(!function)
5030                                        {
5031                                           // TODO: Fix memory leak
5032                                           function = ClassFunction
5033                                           {
5034                                              declarator = Declarator { symbol = Symbol { string = CopyString(member.initializer.exp.member.member ? member.initializer.exp.member.member.string : "") } }
5035                                           };
5036                                        }
5037                                     }
5038                                     else
5039                                        break;
5040                                  }
5041                               }
5042                            }
5043                         }
5044                         break;
5045                      }
5046                      case methodMembersInit:
5047                      {
5048                         if(members.function.declarator && !strcmp(members.function.declarator.symbol.string, methodName))
5049                         {
5050                            function = members.function;
5051                            found = 1;
5052                         }
5053                         break;
5054                      }
5055                   }
5056                   if(function)
5057                      break;
5058                }
5059             }
5060          }
5061       }
5062       if(functionPtr) *functionPtr = function;
5063       return found;
5064    }
5065
5066    void GoToMethod(char * methodName /*Method method*/)
5067    {
5068       if(methodName)
5069       {
5070          ObjectInfo object = selected;
5071          EditBoxStream f { editBox = editBox };
5072          ClassFunction function = null;
5073          bool atChar = false;
5074          int indent = 6;
5075          EditLine l1, l2;
5076          int y1,y2, x1, x2;
5077          Location propLoc = { {0,0,-1} };
5078
5079          // GO TO THE METHOD
5080          if(FindMethod(methodName, &function, &propLoc) == 1 && object != this.oClass) indent = 9;
5081          if(function && function.body)
5082          {
5083             bool lfCount = 0;
5084             f.Seek(function.body.loc.start.pos+1, current);
5085             for(;;)
5086             {
5087                char ch;
5088                if(!f.Getc(&ch))
5089                   break;
5090                if(ch == '\n')
5091                {
5092                   if(lfCount)
5093                   {
5094                      f.Seek(-1, current);
5095                      break;
5096                   }
5097                   lfCount++;
5098                }
5099                else if(!isspace(ch))
5100                {
5101                   f.Seek(-1, current);
5102                   atChar = true;
5103                   break;
5104                }
5105             }
5106          }
5107          else if(propLoc.start.pos > -1)
5108          {
5109             f.Seek(propLoc.start.pos, current);
5110             atChar = true;
5111          }
5112          editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
5113          delete f;
5114          if(function || propLoc.start.pos > -1)
5115          {
5116             editBox.SetSelPos(l1, y1, atChar ? x1 : indent, l2, y2, atChar ? x2 : indent);
5117             editBox.CenterOnCursor();
5118             SetState(normal, false, 0);
5119             Activate();
5120
5121             if(function && function.declarator && function.declarator.symbol && !function.declarator.symbol.type)
5122             {
5123                FreeClassFunction(function);
5124             }
5125          }
5126       }
5127    }
5128
5129    void FindCompatibleMethods(Method method, OldList compatible)
5130    {
5131       ClassDefinition classDef = this.oClass.classDefinition;
5132       if(classDef && classDef.definitions)
5133       {
5134          Class regClass { };
5135          Class baseClass = eSystem_FindClass(this.privateModule, ((Specifier)classDef.baseSpecs->first).name);
5136          ClassDef def;
5137          Class _class;
5138          Symbol classSym { };
5139          Symbol selectedClass;
5140          if(this.selected == this.oClass)
5141             selectedClass = classSym;
5142          else
5143             selectedClass = FindClass(this.selected.instance._class.name);
5144
5145          regClass.name = classDef._class.name;
5146          regClass.base = eSystem_FindClass(this.privateModule, ((Specifier)classDef.baseSpecs->first).name);
5147          for(def = classDef.definitions->first; def; def = def.next)
5148          {
5149             if(def.type == functionClassDef && def.function.declarator)
5150             {
5151                Method vMethod = eClass_FindMethod(baseClass, def.function.declarator.symbol.string, this.privateModule);
5152                if(!vMethod)
5153                   vMethod = eClass_FindMethod(this.selected.instance._class, def.function.declarator.symbol.string, this.privateModule);
5154                if(!vMethod)
5155                {
5156                   Type type = def.function.declarator.symbol.type;
5157                   if(CheckCompatibleMethod(method, type, regClass, this.selected == this.oClass, FindClass(this.selected.instance._class.name)))
5158                   {
5159                      compatible.Add(OldLink { data = def.function });
5160                   }
5161                }
5162             }
5163          }
5164
5165          if(this.oClass && this.oClass.instance)
5166          {
5167             classSym.registered = regClass;
5168             //classSym.registered = this.oClass.oClass;
5169
5170             for(_class = regClass.base; _class; _class = _class.base)
5171             {
5172                Method testMethod;
5173                for(testMethod = (Method)_class.methods.first; testMethod; testMethod = (Method)((BTNode)testMethod).next)
5174                {
5175                   // TODO: Understand why these functions popup in attach list
5176                   if(testMethod.type != virtualMethod /*&& testMethod.function != Window_OnGetString && testMethod.function != Window_OnGetDataFromString*/)
5177                   {
5178                      if(!testMethod.dataType)
5179                         testMethod.dataType = ProcessTypeString(testMethod.dataTypeString, false);
5180
5181                      //if(CheckCompatibleMethod(method, testMethod.dataType, &regClass, false, selectedClass)) // this.selected == this.oClass, selectedClass))
5182                      if(CheckCompatibleMethod(method, testMethod.dataType, this.oClass.instance._class, false, selectedClass)) // this.selected == this.oClass, selectedClass))
5183                      //if(CheckCompatibleMethod(method, testMethod.dataType, &regClass, this.selected == this.oClass, FindClass(this.oClass.oClass.name)))
5184                      {
5185                         // TODO: Fix memory leak, Figure out if it should be ClassFunction or FunctionDefinition
5186                         // ClassFunction function { };
5187                         FunctionDefinition function { };
5188
5189                         function.declarator = Declarator { };
5190                         function.declarator.symbol = Symbol { string = CopyString(testMethod.name) };
5191                         excludedSymbols.Add(function.declarator.symbol);
5192
5193                         compatible.Add(OldLink { data = function });
5194                      }
5195                   }
5196                }
5197             }
5198          }
5199          delete regClass;
5200          delete classSym;
5201       }
5202    }
5203
5204    void AddMethod(Method method)
5205    {
5206       if(method)
5207       {
5208          char methodName[1024];
5209          strcpy(methodName, method.name);
5210          if(!FindMethod(methodName, null, null))
5211          {
5212             methodAction = actionAddMethod;
5213             this.method = method;
5214             ModifyCode();
5215          }
5216          UpdateFormCode();
5217          GoToMethod(methodName);
5218       }
5219    }
5220
5221    void DeleteMethod(ClassFunction function)
5222    {
5223       if(function)
5224       {
5225          methodAction = actionDeleteMethod;
5226          this.function = function;
5227          ModifyCode();
5228          UpdateFormCode();
5229
5230          Update(null);
5231       }
5232    }
5233
5234    void AttachMethod(Method method, ClassFunction function)
5235    {
5236       if(function)
5237       {
5238          // If it's an instance we'll ask if we want to move it inside...
5239          if(!function.attached.count && function.body)
5240          {
5241             // Find the function in the _class to check if it's a virtual function
5242             Class regClass = eSystem_FindClass(this.privateModule, ((Specifier)this.oClass.classDefinition.baseSpecs->first).name);
5243             Method method = eClass_FindMethod(regClass, function.declarator.symbol.string, this.privateModule);
5244             /*    LATER we'll need to check for public/virtual properties etc, for now only checked if virtual in base _class
5245             ClassDef def;
5246             for(def = this.classDefinition.first; def; def = def.next)
5247             {
5248                if(def.type == functionClassDef)
5249                {
5250                   if(def.function == function)
5251                      break;
5252                }
5253             }
5254             */
5255             if(!method || method.type != virtualMethod)
5256             {
5257                char title[1024];
5258                sprintf(title, $"Attach %s", function.declarator.symbol.string);
5259                if(MessageBox { type = yesNo, master = parent, text = title, contents = $"Method is unused. Move method inside instance?"}.Modal() == yes)
5260                {
5261                   moveAttached = true;
5262                }
5263             }
5264          }
5265
5266          methodAction = actionAttachMethod;
5267          this.method = method;
5268          this.function = function;
5269          ModifyCode();
5270          UpdateFormCode();
5271          Update(null);
5272       }
5273    }
5274
5275    void ReAttachMethod(Method method, ClassFunction function)
5276    {
5277       if(function)
5278       {
5279          // If it's an instance we'll ask if we want to move it inside...
5280          if(!function.attached.count && function.body)
5281          {
5282             // Find the function in the _class to check if it's a virtual function
5283             Class regClass = eSystem_FindClass(this.privateModule, ((Specifier)this.oClass.classDefinition.baseSpecs->first).name);
5284             Method method = eClass_FindMethod(regClass, function.declarator.symbol.string, this.privateModule);
5285             /*    LATER we'll need to check for public/virtual properties etc, for now only checked if virtual in base _class
5286             ClassDef def;
5287             for(def = this.classDefinition.first; def; def = def.next)
5288             {
5289                if(def.type == functionClassDef)
5290                {
5291                   if(def.function == function)
5292                      break;
5293                }
5294             }
5295             */
5296             if(!method || method.type != virtualMethod)
5297             {
5298                char title[1024];
5299                sprintf(title, $"Attach %s", function.declarator.symbol.string);
5300                if(MessageBox { type = yesNo, master = parent, text = title,
5301                   contents = $"Method is unused. Move method inside instance?" }.Modal() == yes)
5302                {
5303                   moveAttached = true;
5304                }
5305             }
5306          }
5307
5308          methodAction = actionReattachMethod;
5309          this.method = method;
5310          this.function = function;
5311          ModifyCode();
5312          UpdateFormCode();
5313          Update(null);
5314       }
5315    }
5316
5317    void DetachMethod(Method method, ClassFunction function, int type)
5318    {
5319       bool result = true;
5320
5321       if(type == 1)
5322       {
5323          Window dialog
5324          {
5325             hasClose = true, borderStyle = sizable, minClientSize = { 300, 55 },
5326             master = sheet, text = $"Name detached method", background = formColor
5327          };
5328          Button cancelButton
5329          {
5330             dialog, anchor = { horz = 45, top = 30 }, size = { 80 }, text = $"Cancel", hotKey = escape,
5331             id = DialogResult::cancel, NotifyClicked = ButtonCloseDialog
5332          };
5333          Button okButton
5334          {
5335             dialog, anchor = { horz = -45, top = 30 }, size = { 80 }, text = $"OK", isDefault = true,
5336             id = DialogResult::ok, NotifyClicked = ButtonCloseDialog
5337          };
5338          EditBox nameBox
5339          {
5340             dialog, anchor = { left = 5, right = 5, top = 5 }
5341          };
5342          sprintf(methodName, "%s_%s", selected.name, method.name);
5343          nameBox.contents = methodName;
5344          incref nameBox;
5345          result = dialog.Modal() == ok;
5346          strcpy(methodName, nameBox.contents);
5347          delete nameBox;
5348       }
5349       if(result)
5350       {
5351          // If the method is not attached, move it outside
5352          if(type == 1)
5353          {
5354             // Add this class to the methodName
5355             char name[1024] = "";
5356
5357             if(this.selected != this.oClass && !method.dataType.thisClass)
5358             {
5359                strcat(name, this.selected.instance._class.name);
5360                strcat(name, "::");
5361                strcat(name, this.methodName);
5362                strcpy(this.methodName, name);
5363             }
5364             else if(method.dataType.thisClass && (this.selected == this.oClass || !eClass_IsDerived(this.oClass.instance._class, method.dataType.thisClass.registered)))
5365             {
5366                strcat(name, method.dataType.thisClass.string);
5367                strcat(name, "::");
5368                strcat(name, this.methodName);
5369                strcpy(this.methodName, name);
5370             }
5371
5372             this.moveAttached = true;
5373          }
5374
5375          this.methodAction = actionDetachMethod;
5376          this.method = method;
5377          this.function = function;
5378          ModifyCode();
5379          UpdateFormCode();
5380          Update(null);
5381       }
5382    }
5383
5384    void AddObject(Instance instance, ObjectInfo * object)
5385    {
5386       int id;
5387       incref instance;
5388       //*object = _class.instances.Add(sizeof(ObjectInfo));
5389       *object = ObjectInfo { };
5390       oClass.instances.Insert((selected.oClass == selected) ? null : selected, *object);
5391       (*object).oClass = oClass;
5392       (*object).instance = instance;
5393       for(id = 1;; id++)
5394       {
5395          char name[1024];
5396          ObjectInfo check;
5397          sprintf(name, "%c%s%d", tolower(instance._class.name[0]), instance._class.name+1, id);
5398
5399          // if(strcmp(name, this.oClass.instance.name))
5400
5401          {
5402             for(check = oClass.instances.first; check; check = check.next)
5403                if(!check.deleted && check.name && !strcmp(name, check.name))
5404                   break;
5405             if(!check)
5406             {
5407                (*object).name = CopyString(name);
5408                break;
5409             }
5410          }
5411       }
5412       toolBox.controlClass = null;
5413
5414       ModifyCode();
5415
5416       //sheet.AddObject(*object, (*object).name, TypeData, true);
5417
5418       selected = *object;
5419    }
5420
5421    void EnsureUpToDate()
5422    {
5423       if(sheet && codeModified && parsing)
5424          ParseCode();
5425    }
5426
5427    void SelectObject(ObjectInfo object)
5428    {
5429       selected = object;
5430       oClass = object ? object.oClass : null;
5431       if(designer)
5432          designer.SelectObject(object, object ? object.instance : null);
5433    }
5434
5435    void SelectObjectFromDesigner(ObjectInfo object)
5436    {
5437       selected = object;
5438       sheet.SelectObject(object);
5439    }
5440
5441    void EnumerateObjects(Sheet sheet)
5442    {
5443       ObjectInfo oClass;
5444
5445       for(oClass = classes.first; oClass; oClass = oClass.next)
5446       {
5447          if(oClass.instance)
5448          {
5449             ObjectInfo object;
5450
5451             sheet.AddObject(oClass, oClass.name ? oClass.name : oClass.instance._class.name, typeClass, false);
5452             for(object = oClass.instances.first; object; object = object.next)
5453                sheet.AddObject(object, object.name ? object.name : object.instance._class.name, typeData, false);
5454          }
5455       }
5456       sheet.SelectObject(selected);
5457    }
5458
5459    void AddControl()
5460    {
5461       designer.AddObject();
5462    }
5463
5464    void DeleteObject(ObjectInfo object)
5465    {
5466       delete object.instance;
5467       object.deleted = true;
5468       object.modified = true;
5469       object.oClass.modified = true;
5470
5471       if(selected == object)
5472       {
5473          bool looped = false;
5474          ObjectInfo select = object;
5475
5476          for(;;)
5477          {
5478             select = select.prev;
5479             if(!select)
5480             {
5481                if(looped) break;
5482                select = object.oClass.instances.last;
5483                if(!select) break;
5484                looped = true;
5485             }
5486             if(!select.deleted)
5487                break;
5488          }
5489          sheet.SelectObject(select ? select : oClass);
5490       }
5491
5492       if(!object.instCode && object.oClass != object)
5493       {
5494          delete object.name;
5495          oClass.instances.Delete(object);
5496       }
5497
5498       if(sheet.codeEditor == this)
5499          sheet.DeleteObject(object);
5500    }
5501
5502    void RenameObject(ObjectInfo object, char * name)
5503    {
5504       bool valid = false;
5505
5506       // Validate the name:
5507       if(object != oClass && (!name || !name[0])) valid = true;   // What's this one again?
5508       else if(name[0] && (isalpha(name[0]) || name[0] == '_'))
5509       {
5510          int c;
5511          for(c = 0; name[c]; c++)
5512             if(!isalnum(name[c]) && name[c] != '_' && name[c] != '_')
5513                break;
5514          if(!name[c])
5515             valid = true;
5516       }
5517       if(valid)
5518       {
5519          delete object.name;
5520          object.name = (name && name[0]) ? CopyString(name) : null;
5521
5522          sheet.RenameObject(object, object.name ? object.name : object.instance._class.name);
5523       }
5524    }
5525
5526    void DesignerModifiedObject()
5527    {
5528       sheet.ListProperties(false);
5529       sheet.Update(null);
5530    }
5531
5532    void ListSubMembers(Type member)
5533    {
5534       Type subMember;
5535
5536       for(subMember = member.members.first; subMember; subMember = subMember.next)
5537       {
5538          if(subMember.name)
5539          {
5540             DataRow row = membersList.AddString(subMember.name);
5541             row.icon = icons[typeData];
5542          }
5543          else
5544          {
5545             ListSubMembers(subMember);
5546          }
5547       }
5548    }
5549
5550    void ListSubDataMembers(DataMember member, bool isPrivate)
5551    {
5552       DataMember subMember;
5553       for(subMember = member.members.first; subMember; subMember = subMember.next)
5554       {
5555          if((subMember.memberAccess == publicAccess && !isPrivate) || subMember._class.module == privateModule)
5556          {
5557             if(subMember.name)
5558             {
5559                DataRow row = membersList.AddString(subMember.name);
5560                BitmapResource bitmap = null;
5561                if(!subMember.dataType)
5562                   subMember.dataType = ProcessTypeString(subMember.dataTypeString, false);
5563
5564                if(subMember.dataType && subMember.dataType.kind == classType && subMember.dataType._class)
5565                {
5566                   char * bitmapName = (char *)eClass_GetProperty(subMember.dataType._class.registered, "icon");
5567                   if(bitmapName)
5568                   {
5569                      bitmap = { bitmapName };
5570                      membersList.AddResource(bitmap);
5571                   }
5572                }
5573                row.icon = bitmap ? bitmap : icons[(subMember.memberAccess == publicAccess && !isPrivate) ? typeData : typeDataPrivate];
5574             }
5575             else
5576             {
5577                ListSubDataMembers(subMember, isPrivate || member.memberAccess == privateAccess);
5578             }
5579          }
5580       }
5581    }
5582
5583    void ListClassMembers(Class whatClass, bool methodsOnly)
5584    {
5585       Class _class;
5586       Class baseClass = eSystem_FindClass(this.privateModule, "class");
5587       bool isPrivate = false;
5588
5589       for(_class = whatClass; _class && _class.type != systemClass; _class = _class.base)
5590       {
5591          Method method, methodIt;
5592          DataMember member;
5593          DataMember memberIt;
5594
5595          for(methodIt = (Method)_class.methods.first; methodIt; methodIt = (Method)((BTNode)methodIt).next)
5596          {
5597             method = eClass_FindMethod(whatClass, methodIt.name, privateModule);
5598             if(methodIt.memberAccess == privateAccess && method && method.memberAccess == publicAccess)
5599                method = methodIt;
5600             if(method && method._class.type != systemClass && !eClass_FindMethod(baseClass, method.name, this.privateModule))
5601             {
5602                if(method.memberAccess == publicAccess || method._class.module == privateModule)
5603                {
5604                   DataRow row = membersList.FindString(method.name);
5605                   if(!row)
5606                   {
5607                      row = membersList.AddString(method.name);
5608
5609                      if(!method.dataType)
5610                         method.dataType = ProcessTypeString(method.dataTypeString, false);
5611
5612                      row.icon = icons[(method.type == virtualMethod && method.dataType && method.dataType.thisClass) ? typeEvent : ((method.memberAccess == publicAccess && !isPrivate) ? typeMethod : typeMethodPrivate)];
5613                   }
5614                }
5615             }
5616          }
5617
5618          if(!methodsOnly)
5619          {
5620             for(memberIt = _class.membersAndProperties.first; memberIt; memberIt = memberIt.next)
5621             {
5622                if(memberIt.name)
5623                {
5624                   if(memberIt.isProperty)
5625                   {
5626                      member = (DataMember)eClass_FindProperty(whatClass, memberIt.name, privateModule);
5627                      if(!member)
5628                         member = eClass_FindDataMember(whatClass, memberIt.name, privateModule, null, null);
5629                   }
5630                   else
5631                   {
5632                      member = eClass_FindDataMember(whatClass, memberIt.name, privateModule, null, null);
5633                      if(!member)
5634                         member = (DataMember)eClass_FindProperty(whatClass, memberIt.name, privateModule);
5635                   }
5636
5637                   if(memberIt.memberAccess == privateAccess && member && member.memberAccess == publicAccess)
5638                      member = memberIt;
5639                }
5640                else
5641                   member = memberIt;
5642
5643                if(member && (member.memberAccess == publicAccess || member._class.module == privateModule))
5644                {
5645                   if(member.isProperty)
5646                   {
5647                      Property prop = (Property) member;
5648                      if(!membersList.FindString(prop.name))
5649                      {
5650                         DataRow row = membersList.AddString(prop.name);
5651                         row.icon = icons[(member.memberAccess == publicAccess && !isPrivate) ? typeProperty : typePropertyPrivate];
5652                      }
5653                   }
5654                   else if(member.name && !membersList.FindString(member.name))
5655                   {
5656                      DataRow row = membersList.AddString(member.name);
5657
5658                      BitmapResource bitmap = null;
5659                      if(!member.dataType)
5660                         member.dataType = ProcessTypeString(member.dataTypeString, false);
5661
5662                      if(member.dataType && member.dataType.kind == classType && member.dataType._class)
5663                      {
5664                         char * bitmapName = (char *)eClass_GetProperty(member.dataType._class.registered, "icon");
5665                         if(bitmapName)
5666                         {
5667                            bitmap = { bitmapName };
5668                            membersList.AddResource(bitmap);
5669                         }
5670                      }
5671                      row.icon = bitmap ? bitmap : icons[(member.memberAccess == publicAccess && !isPrivate) ? typeData : typeDataPrivate];
5672                   }
5673                   else
5674                      ListSubDataMembers(member, member.memberAccess == privateAccess);
5675                }
5676             }
5677          }
5678          if(_class.inheritanceAccess == privateAccess)
5679          {
5680             isPrivate = true;
5681             if(_class.module != privateModule) break;
5682          }
5683       }
5684    }
5685
5686    void ListClassMembersMatch(Class whatClass, Type methodType)
5687    {
5688       Class _class;
5689       Class baseClass = eSystem_FindClass(this.privateModule, "class");
5690       bool isPrivate = false;
5691
5692       for(_class = whatClass; _class && _class.type != systemClass; _class = _class.base)
5693       {
5694          Method method;
5695          Property prop;
5696          DataMember member;
5697
5698          for(method = (Method)_class.methods.first; method; method = (Method)((BTNode)method).next)
5699          {
5700             if(method.memberAccess == publicAccess || method._class.module == privateModule)
5701             {
5702                if(method._class.type != systemClass && !eClass_FindMethod(baseClass, method.name, this.privateModule))
5703                {
5704                   if(!method.dataType)
5705                      method.dataType = ProcessTypeString(method.dataTypeString, false);
5706
5707                   if(MatchTypes(method.dataType, methodType, null, whatClass, /*null, */whatClass, false, true, false, false))
5708                   {
5709                      DataRow row = membersList.FindString(method.name);
5710                      if(!row)
5711                      {
5712                         row = membersList.AddString(method.name);
5713                         row.icon = icons[(method.type == virtualMethod && method.dataType.thisClass) ? typeEvent : ((method.memberAccess == publicAccess && !isPrivate) ? typeMethod : typeMethodPrivate)];
5714                      }
5715                   }
5716                }
5717             }
5718          }
5719          if(_class.inheritanceAccess == privateAccess)
5720          {
5721             isPrivate = true;
5722             if(_class.module != privateModule) break;
5723          }
5724       }
5725    }
5726
5727    void ListClassPropertiesAndVirtual(Class whatClass, String curString)
5728    {
5729       Class _class;
5730       bool isPrivate = false;
5731       for(_class = whatClass; _class /*&& _class.type != systemClass*/; _class = _class.base)
5732       {
5733          Method method;
5734          Property prop;
5735          DataMember member;
5736
5737          for(method = (Method)_class.methods.first; method; method = (Method)((BTNode)method).next)
5738          {
5739             if(method.type == virtualMethod)
5740             {
5741                if(method.memberAccess == publicAccess || method._class.module == privateModule)
5742                {
5743                   DataRow row = membersList.FindString(method.name);
5744                   if(!row)
5745                   {
5746                      row = membersList.AddString(method.name);
5747
5748                      if(!method.dataType)
5749                         method.dataType = ProcessTypeString(method.dataTypeString, false);
5750
5751                      row.icon = icons[method.dataType.thisClass ? typeEvent : ((method.memberAccess == publicAccess && !isPrivate) ? typeMethod : typeMethodPrivate)];
5752                   }
5753                }
5754             }
5755          }
5756
5757          for(member = _class.membersAndProperties.first; member; member = member.next)
5758          {
5759             if(member.memberAccess == publicAccess || member._class.module == privateModule)
5760             {
5761                if(member.isProperty)
5762                {
5763                   Property prop = (Property)member;
5764                   {
5765                      DataRow row = membersList.AddString(prop.name);
5766                      row.icon = icons[(member.memberAccess == publicAccess && !isPrivate) ? typeProperty : typePropertyPrivate];
5767                   }
5768                }
5769                else if(member.name && (!curString || strcmp(curString, member.name)))
5770                {
5771                   DataRow row = membersList.AddString(member.name);
5772
5773                   BitmapResource bitmap = null;
5774                   if(!member.dataType)
5775                      member.dataType = ProcessTypeString(member.dataTypeString, false);
5776
5777                   if(member.dataType && member.dataType.kind == classType && member.dataType._class)
5778                   {
5779                      char * bitmapName = (char *)eClass_GetProperty(member.dataType._class.registered, "icon");
5780                      if(bitmapName)
5781                      {
5782                         bitmap = { bitmapName };
5783                         membersList.AddResource(bitmap);
5784                      }
5785                   }
5786                   row.icon = bitmap ? bitmap : icons[(member.memberAccess == publicAccess && !isPrivate) ? typeData : typeDataPrivate];
5787                }
5788                else
5789                   ListSubDataMembers(member, member.memberAccess == privateAccess || isPrivate);
5790             }
5791          }
5792          if(_class.inheritanceAccess == privateAccess)
5793          {
5794             isPrivate = true;
5795             if(_class.module != privateModule) break;
5796          }
5797       }
5798    }
5799
5800    void ListMembers(Type type)
5801    {
5802       if(type && (type.kind == classType || type.kind == structType || type.kind == unionType))
5803       {
5804          Class _class;
5805
5806          if(type.kind == classType)
5807          {
5808             if(type._class)
5809                ListClassMembers(type._class.registered, false);
5810          }
5811          else
5812          {
5813             Type member;
5814             for(member = type.members.first; member; member = member.next)
5815             {
5816                if(member.name)
5817                {
5818                   DataRow row = membersList.AddString(member.name);
5819                   row.icon = icons[typeData];
5820                }
5821                else if(member.kind == structType || member.kind == unionType)
5822                   ListSubMembers(member);
5823             }
5824          }
5825       }
5826    }
5827
5828    void ListModule(Module mainModule, int recurse, bool listClasses)
5829    {
5830       Module module;
5831       ListNameSpace(mainModule.application.systemNameSpace, 1, listClasses);
5832       ListNameSpace(mainModule.application.privateNameSpace, 1, listClasses);
5833       ListNameSpace(mainModule.application.publicNameSpace, 1, listClasses);
5834       for(module = mainModule.application.allModules.first; module; module = module.next)
5835       {
5836          if(ModuleVisibility(mainModule, module))
5837             ListNameSpace(module.publicNameSpace, recurse, listClasses);
5838       }
5839    }
5840
5841    void ListNameSpace(NameSpace nameSpace, int recurse, bool listClasses)
5842    {
5843       NameSpace * ns;
5844       BTNamedLink link;
5845
5846       if(listClasses)
5847       {
5848          for(link = (BTNamedLink)nameSpace.classes.first; link; link = (BTNamedLink)((BTNode)link).next)
5849          {
5850             Class _class = link.data;
5851             if(_class.type != systemClass && !_class.templateClass)  // Omit templatized classes
5852             {
5853                DataRow row = membersList.AddString(_class.name);
5854                row.icon = (_class.type == unitClass || _class.type == enumClass) ? icons[typeDataType] : icons[typeClass];
5855             }
5856          }
5857       }
5858
5859       for(link = (BTNamedLink)nameSpace.defines.first; link; link = (BTNamedLink)((BTNode)link).next )
5860       {
5861          DefinedExpression definedExp = link.data;
5862          DataRow row = membersList.AddString(link /*definedExp*/.name);
5863          row.icon = icons[typeData];
5864       }
5865
5866       for(link = (BTNamedLink)nameSpace.functions.first; link; link = (BTNamedLink)((BTNode)link).next)
5867       {
5868          GlobalFunction function = link.data;
5869          DataRow row = membersList.AddString(link /*function*/.name);
5870          row.icon = icons[typeMethod];
5871       }
5872
5873
5874       for(ns = (NameSpace *)nameSpace.nameSpaces.first; ns; ns = (NameSpace *)((BTNode)ns).next)
5875       {
5876          if(recurse != 2 && listClasses)
5877          {
5878             if(!membersList.FindString(ns->name))
5879             {
5880                DataRow row = membersList.AddString(ns->name);
5881                row.icon = icons[typeNameSpace];
5882             }
5883          }
5884
5885          if(recurse)
5886             ListNameSpace(ns, 2, listClasses);
5887       }
5888    }
5889
5890    void ListEnumValues(Class _class)
5891    {
5892       List<Class> classes { };
5893       for(; _class && _class.type == enumClass; _class = _class.base)
5894          classes.Insert(null, _class);
5895       for(_class : classes)
5896       {
5897          EnumClassData enumeration = (EnumClassData)_class.data;
5898          NamedLink item;
5899          for(item = enumeration.values.first; item; item = item.next)
5900          {
5901             DataRow row = membersList.AddString(item.name);
5902             row.icon = icons[typeEnumValue];
5903          }
5904       }
5905       delete classes;
5906    }
5907
5908    bool ListEnumsModule(Module mainModule, Type dest)
5909    {
5910       bool result = false;
5911       Module module;
5912       result |= ListEnums(mainModule.application.systemNameSpace, dest);
5913       result |= ListEnums(mainModule.application.privateNameSpace, dest);
5914       result |= ListEnums(mainModule.application.publicNameSpace, dest);
5915       for(module = mainModule.application.allModules.first; module; module = module.next)
5916       {
5917          if(ModuleVisibility(mainModule, module))
5918             result |= ListEnums(module.publicNameSpace, dest);
5919       }
5920       return result;
5921    }
5922
5923    void ListNameSpaceByString(Module mainModule, char * string)
5924    {
5925       NameSpace * nameSpace;
5926       Module module;
5927       nameSpace = FindNameSpace(mainModule.application.systemNameSpace, string);
5928       if(nameSpace) ListNameSpace(nameSpace, 0, true);
5929       nameSpace = FindNameSpace(mainModule.application.privateNameSpace, string);
5930       if(nameSpace) ListNameSpace(nameSpace, 0, true);
5931       nameSpace = FindNameSpace(mainModule.application.publicNameSpace, string);
5932       if(nameSpace) ListNameSpace(nameSpace, 0, true);
5933       for(module = mainModule.application.allModules.first; module; module = module.next)
5934       {
5935          if(ModuleVisibility(mainModule, module))
5936          {
5937             nameSpace = FindNameSpace(module.publicNameSpace, string);
5938             if(nameSpace) ListNameSpace(nameSpace, 0, true);
5939          }
5940       }
5941    }
5942
5943    bool ListEnums(NameSpace nameSpace, Type dest)
5944    {
5945       BTNamedLink link;
5946       bool result = false;
5947
5948       for(link = (BTNamedLink)nameSpace.classes.first; link; link = (BTNamedLink)((BTNode)link).next)
5949       {
5950          Class _class = link.data;
5951          if(_class.type == enumClass && (dest.kind != classType || ((!dest._class || !dest._class.registered || (dest._class.registered != _class && strcmp(dest._class.registered.dataTypeString, "char *"))) && !dest.classObjectType)) &&
5952             dest.kind != pointerType && dest.kind != ellipsisType)
5953          {
5954             OldList conversions { };
5955             Type type { };
5956             type.kind = classType;
5957             type._class = FindClass(_class.name);
5958             if(MatchTypes(type, dest, &conversions, null, null, true, false, false, false))
5959             {
5960                ListEnumValues(_class);
5961                result = true;
5962             }
5963             conversions.Free(null);
5964             delete type;
5965          }
5966       }
5967       for(nameSpace = (NameSpace *)nameSpace.nameSpaces.first; nameSpace != null; nameSpace = (NameSpace *)((BTNode)nameSpace).next)
5968       {
5969          result |= ListEnums(nameSpace, dest);
5970       }
5971       return result;
5972    }
5973
5974    NameSpace * FindNameSpace(NameSpace nameSpace, char * name)
5975    {
5976       int start = 0, c;
5977       char ch;
5978       for(c = 0; (ch = name[c]); c++)
5979       {
5980          if(ch == '.' || (ch == ':' && name[c+1] == ':'))
5981          {
5982             NameSpace * newSpace;
5983             char * spaceName = new char[c - start + 1];
5984             memcpy(spaceName, name + start, c - start);
5985             spaceName[c-start] = '\0';
5986             newSpace = (NameSpace *)nameSpace.nameSpaces.FindString(spaceName);
5987             delete spaceName;
5988             if(!newSpace)
5989                return null;
5990             nameSpace = newSpace;
5991             if(ch == ':') c++;
5992             start = c+1;
5993          }
5994       }
5995       if(c - start)
5996       {
5997          // name + start;
5998       }
5999       return (NameSpace *)nameSpace;
6000    }
6001
6002    void ListSymbols(Expression exp, bool enumOnly, char * string, Identifier realIdentifier)
6003    {
6004       bool listedEnums = false;
6005       Type destType = (exp && exp.destType && !exp.destType.truth) ? exp.destType : null;
6006       bool listClasses = true;
6007
6008       if(exp && (exp.type == identifierExp || exp.type == memberExp))
6009       {
6010          // TOCHECK: This memberExp check wasn't here... Some stuff isn't quite done
6011          Identifier id = (exp.type == memberExp) ? exp.member.member : exp.identifier;
6012          char * colons = id ? RSearchString(id.string, "::", strlen(id.string), true, false) : null;
6013
6014          if(exp.type == identifierExp)
6015             id = realIdentifier;
6016
6017          if(id && id._class && !id._class.name)
6018          {
6019             listClasses = false;
6020             SetThisClass(null);
6021          }
6022          else if(id && id._class && id._class.name)
6023          {
6024             if(id.classSym)
6025             {
6026                Class _class = id.classSym.registered;
6027                if(_class && _class.type == enumClass)
6028                {
6029                   ListEnumValues(_class);
6030                }
6031                else
6032                   ListClassMembers(id.classSym.registered, true);
6033                return;
6034             }
6035             return;
6036          }
6037          else if(id && colons)
6038          {
6039             ListNameSpaceByString(this.privateModule, id.string);
6040             return;
6041          }
6042       }
6043
6044       if(this.privateModule && destType && (destType.kind != pointerType || destType.type.kind != voidType) && destType.kind != ellipsisType)
6045       {
6046          listedEnums = ListEnumsModule(this.privateModule, destType);
6047       }
6048
6049       if(destType && destType.kind == classType && destType._class.registered && destType._class.registered.type == enumClass)
6050       {
6051          ListEnumValues(destType._class.registered);
6052
6053          if(insideClass)
6054             ListClassPropertiesAndVirtual(insideClass, null);
6055
6056          listedEnums = true;
6057       }
6058       else if(destType && destType.kind == enumType)
6059       {
6060          NamedLink value;
6061
6062          for(value = destType.members.first; value; value = value.next)
6063          {
6064             DataRow row = membersList.AddString(value.name);
6065             row.icon = icons[typeEnumValue];
6066          }
6067
6068          if(insideClass)
6069             ListClassPropertiesAndVirtual(insideClass, null);
6070
6071          listedEnums = true;
6072       }
6073       else if(insideClass && !enumOnly)
6074       {
6075          ListClassPropertiesAndVirtual(insideClass, string);
6076       }
6077
6078       if(listedEnums && string && string[0])
6079       {
6080          DataRow row = membersList.FindSubString(string);
6081          if(!row)
6082             listedEnums = false;
6083       }
6084
6085       if(!insideClass && exp && exp.destType && exp.destType.kind == functionType && GetThisClass())
6086       {
6087          ListClassMembersMatch(GetThisClass(), exp.destType);
6088       }
6089       else if(!insideClass && !enumOnly && !listedEnums)
6090       {
6091          Context ctx;
6092          Symbol symbol = null;
6093          {
6094             if(GetThisClass())
6095             {
6096                ListClassMembers(GetThisClass(), false);
6097             }
6098
6099             for(ctx = listClasses ? GetCurrentContext() : GetTopContext(); ctx != GetTopContext().parent && !symbol; ctx = ctx.parent)
6100             {
6101                for(symbol = (Symbol)ctx.symbols.first; symbol; symbol = (Symbol)((BTNode)symbol).next)
6102                {
6103                   // Don't list enum values?
6104                   //if(symbol.type.kind != TypeEnum)
6105                   DataRow row = membersList.FindString(symbol.string);
6106                   if(!row)
6107                   {
6108                      if(GetBuildingEcereComModule() && symbol.type && symbol.type.kind == functionType && eSystem_FindFunction(privateModule, symbol.string))
6109                         continue;
6110                      row = membersList.AddString(symbol.string);
6111                      if(symbol.type && symbol.type.kind == functionType)
6112                         row.icon = icons[typeMethod];
6113                      else if(symbol.type && symbol.type.kind == enumType)
6114                      {
6115                         row.icon = icons[typeEnumValue];
6116                      }
6117                      else
6118                      {
6119                         BitmapResource bitmap = null;
6120                         if(symbol.type && symbol.type.kind == classType && symbol.type._class && symbol.type._class)
6121                         {
6122                            char * bitmapName = (char *)eClass_GetProperty(symbol.type._class.registered, "icon");
6123                            if(bitmapName)
6124                            {
6125                               bitmap = { bitmapName };
6126                               membersList.AddResource(bitmap);
6127                            }
6128                         }
6129                         row.icon = bitmap ? bitmap : icons[typeData];
6130                      }
6131                   }
6132                }
6133
6134                if(listClasses)
6135                {
6136                   for(symbol = (Symbol)ctx.types.first; symbol; symbol = (Symbol)((BTNode)symbol).next)
6137                   {
6138                      DataRow row = membersList.FindString(symbol.string);
6139                      if(!row)
6140                      {
6141                         row = membersList.AddString(symbol.string);
6142                         if(symbol.type.kind == functionType)
6143                            row.icon = icons[typeMethod];
6144                         else if(symbol.type.kind == classType && (!symbol.type._class.registered || (symbol.type._class.registered.type != unitClass && symbol.type._class.registered.type != enumClass)))
6145                         {
6146                            row.icon = icons[typeClass];
6147                         }
6148                         else
6149                         {
6150                            row.icon = icons[typeDataType];
6151                         }
6152                      }
6153                   }
6154                }
6155             }
6156
6157             ListModule(this.privateModule, 1, listClasses);
6158             // TODO: Implement this with name space
6159             /*
6160             {
6161                GlobalData data;
6162                for(data = globalData.first; data; data = data.next)
6163                {
6164                   DataRow row = membersList.FindString(data.name);
6165                   if(!data.dataType)
6166                      data.dataType = ProcessTypeString(data.dataTypeString, false);
6167                   if(!row)
6168                   {
6169                      row = membersList.AddString(data.name);
6170
6171                      if(data.dataType && data.dataType.kind == TypeEnum)
6172                      {
6173                         row.icon = icons[typeEnumValue];
6174                      }
6175                      else
6176                      {
6177                         BitmapResource bitmap = null;
6178                         if(data.dataType && data.dataType.kind == classType && data.dataType._class && data.dataType._class)
6179                         {
6180                            char * bitmapName = (char *)eClass_GetProperty(data.dataType._class.registered, "icon");
6181                            if(bitmapName)
6182                            {
6183                               bitmap = { bitmapName };
6184                               membersList.AddResource(bitmap);
6185                            }
6186                         }
6187                         row.icon = bitmap ? bitmap : icons[typeData];
6188                      }
6189                   }
6190                }
6191             }
6192             */
6193
6194             {
6195                DataRow row = membersList.AddString("Min");
6196                row.icon = icons[typeMethod];
6197
6198                row = membersList.AddString("Max");
6199                row.icon = icons[typeMethod];
6200
6201                row = membersList.AddString("Abs");
6202                row.icon = icons[typeMethod];
6203
6204                row = membersList.AddString("Sgn");
6205                row.icon = icons[typeMethod];
6206             }
6207          }
6208       }
6209    }
6210
6211    void OverrideVirtualFunction(ClassFunction function, Method method, Class _class, bool isInstance, bool extraIndent)
6212    {
6213       EditBoxStream f { editBox = editBox };
6214       uint position = 0;
6215       EditLine l1, l2;
6216       int x1,y1,x2,y2;
6217
6218       updatingCode = true;
6219
6220       if(!method.dataType)
6221          method.dataType = ProcessTypeString(method.dataTypeString, false);
6222
6223       DeleteJunkBefore(f, function.loc.start.pos, &position);
6224       f.DeleteBytes(function.loc.end.pos - function.loc.start.pos - 1);
6225
6226       // ADDING METHOD HERE
6227       {
6228          Type dataType = method.dataType;
6229          Type returnType = dataType.returnType;
6230          Type param;
6231          Class moduleClass = eSystem_FindClass(this.privateModule, "Module");
6232
6233          if(insideDef.prev)
6234              f.Printf("\n\n");
6235          else
6236             f.Printf("\n");
6237          if(extraIndent) f.Printf("   ");
6238          f.Printf("   ");
6239          OutputType(f, returnType, false);
6240
6241          f.Printf(" ");
6242
6243          if(dataType.thisClass && !dataType.classObjectType && (!isInstance || !insideClass || !eClass_IsDerived(insideClass, dataType.thisClass.registered)))
6244          {
6245             if(dataType.thisClass.shortName)
6246                f.Printf(dataType.thisClass.shortName);
6247             else
6248                f.Printf(dataType.thisClass.string);
6249             f.Printf("::");
6250          }
6251          f.Printf(method.name);
6252          f.Printf("(");
6253          for(param = dataType.params.first; param; param = param.next)
6254          {
6255             // Decided not to write void...
6256             if(param.kind != voidType)
6257             {
6258                OutputType(f, param, true);
6259                if(param.next)
6260                   f.Printf(", ");
6261             }
6262          }
6263          f.Printf(")\n");
6264          if(extraIndent) f.Printf("   ");
6265          f.Printf("   %c\n", OpenBracket);
6266
6267          editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
6268
6269          f.Printf("\n");
6270
6271          if(!_class ||
6272             (
6273                (isInstance ? _class : _class.base)._vTbl[method.vid] == moduleClass._vTbl[__ecereVMethodID___ecereNameSpace__ecere__com__Module_OnLoad] ||
6274                (isInstance ? _class : _class.base)._vTbl[method.vid] == DummyMethod)) // Temp Check for DefaultFunction
6275          {
6276             if(returnType && returnType.kind == classType && !strcmp(returnType._class.string, "bool"))
6277             {
6278                if(extraIndent) f.Printf("   ");
6279                f.Printf("      return true;\n");
6280             }
6281             else if(returnType && returnType.kind != voidType)
6282             {
6283                if(extraIndent) f.Printf("   ");
6284                f.Printf("      return 0;\n");
6285             }
6286          }
6287          else
6288          {
6289             if(extraIndent) f.Printf("   ");
6290             f.Printf("      ");
6291             if(returnType.kind != voidType)
6292                f.Printf("return ");
6293             f.Printf("%s::%s(", isInstance ? _class.name : _class.base.name, method.name);
6294             for(param = dataType.params.first; param; param = param.next)
6295             {
6296                if(param.prev) f.Printf(", ");
6297                if(param.kind != voidType)
6298                   f.Printf(param.name);
6299             }
6300             f.Printf(");\n");
6301          }
6302       }
6303
6304       if(extraIndent) f.Printf("   ");
6305       f.Printf("   %c", CloseBracket);
6306       // f.Printf("\n");
6307
6308       delete f;
6309
6310       if(extraIndent) { x1 += 3; x2 += 3; }
6311       editBox.SetSelPos(l1, y1, x1 + 6, l2, y2, x2 + 6);
6312
6313       this.updatingCode = false;
6314
6315    }
6316
6317    // Return false if we overrided a function and don't want to run params listing
6318    bool InvokeAutoComplete(bool enumOnly, int pointer, bool caretMove)
6319    {
6320       bool didOverride = false;
6321       EditLine line = editBox.line;
6322       char * text = line.text;
6323       int lineNum, charPos;
6324       Expression exp = null;
6325       EditLine l1, l2;
6326       int x1,y1, x2,y2;
6327       //Identifier id = null;
6328       Expression memberExp = null;
6329       Identifier realIdentifier = null;
6330
6331       if(!parsing) return true;
6332       if(!privateModule) return !didOverride;
6333
6334       insideFunction = null;
6335
6336       charPos = editBox.charPos + 1;
6337       if(!membersListShown)
6338       {
6339          EnsureUpToDate();
6340       }
6341
6342       editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
6343       {
6344          EditBoxStream f { editBox = editBox };
6345
6346          updatingCode = true;
6347          editBox.SetSelPos(l1, y1, x1, l2, y2, x2);
6348          for(;;)
6349          {
6350             char ch;
6351             if(!f.Seek(-1, current))
6352                break;
6353             f.Getc(&ch);
6354             if(!isspace(ch)) break;
6355             f.Seek(-1, current);
6356          }
6357          editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
6358
6359          lineNum = editBox.lineNumber + 1;
6360          charPos = editBox.charPos + 1;
6361          delete f;
6362          updatingCode = false;
6363       }
6364
6365       if(!membersListShown)
6366       {
6367          memberExp = FindExpTree(ast, lineNum, charPos);
6368          if(memberExp && (memberExp.type == TypeKind::memberExp || memberExp.type == pointerExp) && !memberExp.addedThis)
6369          {
6370          }
6371          else if(!pointer)
6372          {
6373             editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
6374             {
6375                EditBoxStream f { editBox = editBox };
6376                char ch = 0;
6377
6378                updatingCode = true;
6379
6380                editBox.SetSelPos(l1, y1, x1, l2, y2, x2);
6381
6382                f.Getc(&ch);
6383                if(ch == '}' || ch == ',' || ch == ')')
6384                {
6385                   f.Seek(-1, current);
6386                   ch = ' ';
6387                }
6388                if(isspace(ch))
6389                {
6390                   for(;;)
6391                   {
6392                      char ch;
6393                      if(!f.Seek(-1, current))
6394                         break;
6395                      f.Getc(&ch);
6396                      if(!isspace(ch)) break;
6397                      f.Seek(-1, current);
6398                   }
6399                }
6400                else
6401                   f.Seek(-1, current);
6402
6403                editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
6404
6405                lineNum = editBox.lineNumber + 1;
6406                charPos = editBox.charPos + 1;
6407                delete f;
6408                updatingCode = false;
6409             }
6410
6411             realIdentifier = FindCtxTree(ast, lineNum, charPos);
6412             exp = ctxInsideExp;
6413          }
6414       }
6415
6416       editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
6417       lineNum = editBox.lineNumber + 1;
6418       charPos = editBox.charPos/* + 1*/;
6419
6420       {
6421          int rowCount;
6422          char tempString[1024];
6423          char * string = null;
6424          CodePosition idStart, idEnd;
6425
6426          if(membersListShown)
6427          {
6428             char * buffer = membersLine.text;
6429             int c;
6430             bool firstChar = true;
6431             int len = 0;
6432             string = tempString;
6433
6434             for(c = membersLoc.start.charPos; c<membersLoc.end.charPos; c++)
6435             {
6436                bool isSpace = (buffer[c] == ' ' || buffer[c] == '\t');
6437                if(!isSpace) firstChar = false;
6438                if(!firstChar)
6439                   string[len++] = buffer[c];
6440             }
6441             string[len] = 0;
6442          }
6443          else //if(realIdentifier)//if(id)
6444          {
6445             /*
6446             char * buffer = id.string;
6447             int c;
6448             bool firstChar = true;
6449             int len = 0;
6450             string = tempString;
6451             for(c = 0; c<= charPos - id.loc.start.charPos; c++)
6452             {
6453                bool isSpace = (buffer[c] == ' ' || buffer[c] == '\t');
6454                if(!isSpace) firstChar = false;
6455                if(!firstChar)
6456                   string[len++] = buffer[c];
6457             }
6458             string[len] = 0;
6459             */
6460             int x, y;
6461             int len = 0;
6462             EditLine editLine = editBox.line;
6463             bool firstChar = true;
6464             bool done = false;
6465
6466             string = tempString;
6467             for(y = lineNum-1; y >= 0; y--)
6468             {
6469                char * buffer = editLine.text;
6470                int lineCount = editLine.count;
6471                for(x = (y == lineNum-1) ? (Min(charPos, lineCount) - 1 ): lineCount-1; x >= 0; x--)
6472                {
6473                   bool isSpace = (buffer[x] == ' ' || buffer[x] == '\t');
6474                   if(!isSpace)
6475                   {
6476                      if(firstChar)
6477                      {
6478                         idEnd.charPos = x + 2;
6479                         idEnd.line = y + 1;
6480                      }
6481                      firstChar = false;
6482                   }
6483                   // TESTING THIS CODE HERE FOR NOT CONSIDERING bool when doing ctrl-space past it
6484                   else if(firstChar)
6485                   {
6486                      idEnd.charPos = x + 2;
6487                      idEnd.line = y + 1;
6488                      done = true;
6489                      break;
6490                   }
6491                   if(!firstChar)
6492                   {
6493                      if(!isalnum(buffer[x]) && buffer[x] != '_')
6494                      {
6495                         x++;
6496                         done = true;
6497                         break;
6498                      }
6499                      memmove(string+1, string, len++);
6500                      string[0] = buffer[x];
6501                   }
6502                }
6503
6504                //if(done || firstChar)
6505                if(done || !firstChar)
6506                   break;
6507                editLine = editLine.prev;
6508             }
6509             string[len] = 0;
6510             if(!strcmp(string, "case"))
6511             {
6512                idEnd.charPos += 4;
6513                x+=4;
6514                string[0] = '\0';
6515             }
6516             else if(!strcmp(string, "return"))
6517             {
6518                idEnd.charPos += 6;
6519                x+=6;
6520                string[0] = '\0';
6521             }
6522             else if(!strcmp(string, "delete"))
6523             {
6524                idEnd.charPos += 6;
6525                x+=6;
6526                string[0] = '\0';
6527             }
6528             else if(!strcmp(string, "new"))
6529             {
6530                idEnd.charPos += 3;
6531                x+=3;
6532                string[0] = '\0';
6533             }
6534             else if(!strcmp(string, "renew"))
6535             {
6536                idEnd.charPos +=5;
6537                x+=5;
6538                string[0] = '\0';
6539             }
6540             if(x < 0) x = 0;
6541
6542             idStart.charPos = x + 1;
6543             idStart.line = y + 1;
6544          }
6545
6546          if(!membersListShown)
6547          {
6548             membersList.Clear();
6549             if(memberExp && (memberExp.type == ExpressionType::memberExp || memberExp.type == pointerExp) && !memberExp.addedThis)
6550             {
6551                Type type = memberExp.member.exp.expType;
6552                if(pointer == 2 && type)
6553                {
6554                   if(type.kind == pointerType || type.kind == arrayType)
6555                      type = type.type;
6556                   /*else
6557                      type = null;*/
6558                }
6559                ListMembers(type);
6560             }
6561             else if(!pointer)
6562             {
6563                ListSymbols(exp, enumOnly, string, realIdentifier);
6564             }
6565             membersList.Sort(null, 1);
6566          }
6567
6568          if(insideFunction)
6569          {
6570             // Virtual function override
6571             Identifier id = GetDeclId(insideFunction.declarator);
6572             char * string = id ? id.string : null;
6573
6574             Method method = eClass_FindMethod(GetThisClass(), string, this.privateModule);
6575             if(method)
6576             {
6577                if(method.type != virtualMethod || (!insideInstance && method._class == GetThisClass()))
6578                   insideFunction = null;
6579                else
6580                {
6581                   OverrideVirtualFunction(insideFunction, method, GetThisClass(), insideInstance, insideInstance && insideClass);
6582                   didOverride = true;
6583                }
6584             }
6585          }
6586          if(!didOverride) //insideFunction)
6587          {
6588             rowCount = membersList.rowCount;
6589             if(rowCount)
6590             {
6591                DataRow row = string ? membersList.FindSubString(string) : null;
6592                if(row && !membersList.FindSubStringAfter(row, string) && !caretMove)
6593                {
6594                   char * newString = row.string;
6595                   if(!membersListShown)
6596                   {
6597                      membersLoc.start.line = idStart.line-1;
6598                      membersLoc.start.charPos = idStart.charPos-1;
6599                      //membersLoc.end = membersLoc.start;
6600                       membersLoc.end.charPos = idEnd.charPos-1;
6601                       membersLoc.end.line = idEnd.line-1;
6602                      //membersLoc.end.charPos = idStart.charPos + strlen(string)-1; //end.charPos-1;
6603                      //membersLoc.end.charPos = idStart.charPos + strlen(string)-1; //end.charPos-1;
6604                      membersLine = line;
6605                   }
6606                   else
6607                   {
6608                      membersList.Destroy(0);
6609                      membersListShown = false;
6610                   }
6611
6612                   editBox.GoToPosition(membersLine, membersLoc.start.line, membersLoc.start.charPos);
6613                   editBox.Delete(
6614                      line, membersLoc.start.line, membersLoc.start.charPos,
6615                      line, membersLoc.end.line, membersLoc.end.charPos);
6616                   editBox.PutS(newString);
6617                }
6618                else
6619                {
6620                   if(!row)
6621                   {
6622                      row = membersList.FindSubStringi(string);
6623                      if(row)
6624                         membersList.currentRow = row;
6625                      membersList.currentRow.selected = false;
6626                   }
6627                   else
6628                      membersList.currentRow = row;
6629
6630                   if(!membersListShown)
6631                   {
6632                      Point caret;
6633
6634                      // TESTING THESE ADDITIONS TO THE IF SO THAT CARET ISNT MOVED IF NOT ON TOP OF A WORD
6635                      if(string && string[0] && lineNum == idStart.line && charPos >= idStart.charPos-1 && charPos <= idEnd.charPos-1)
6636                         editBox.SetSelPos(l1, y1, idStart.charPos-1, l2, y2, idStart.charPos-1);
6637                      editBox.GetCaretPosition(caret);
6638                      editBox.SetSelPos(l1, y1, x1, l2, y2, x2);
6639
6640                      membersList.master = this;
6641
6642                      caret.y += editBox.GetCaretSize();
6643                      caret.x -= 20;
6644                      membersList.Create();
6645
6646                      {
6647                         int x = caret.x + editBox.absPosition.x - app.desktop.absPosition.x - editBox.scroll.x;
6648                         int y = caret.y + editBox.absPosition.y - app.desktop.absPosition.y - editBox.scroll.y;
6649                         Window parent = membersList.parent;
6650
6651                         if(!paramsAbove && (paramsShown || y + membersList.size.h > parent.clientSize.h))
6652                         {
6653                            y -= editBox.GetCaretSize() + membersList.size.h;
6654                            membersAbove = true;
6655                         }
6656                         else
6657                            membersAbove = false;
6658
6659                         membersList.position = { x, y };
6660                      }
6661
6662                      membersLine = l1;
6663                      membersLoc.start.line = lineNum - 1;
6664
6665                      if(string && string[0])
6666                      {
6667                         membersLoc.start.charPos = idStart.charPos-1;
6668                         membersLoc.end = membersLoc.start;
6669                         //membersLoc.end.charPos = id.loc.end.charPos-1;
6670                         membersLoc.end.charPos = idStart.charPos + strlen(string)-1; //end.charPos-1;
6671                      }
6672                      else
6673                      {
6674                         membersLoc.start.charPos = charPos;
6675                         membersLoc.end = membersLoc.start;
6676                         membersLoc.end.charPos = charPos;
6677                      }
6678                      membersListShown = true;
6679
6680                      // Hack to keep caret shown
6681                      editBox.GetCaretPosition(caret);
6682                      editBox.SetCaret(caret.x, caret.y, editBox.GetCaretSize());
6683                   }
6684                   if(row)
6685                      membersList.SetScrollPosition(0, row.index * membersList.rowHeight);
6686                }
6687             }
6688          }
6689       }
6690
6691       SetCurrentContext(globalContext);
6692       SetThisClass(null);
6693
6694       return !didOverride;
6695    }
6696
6697    void InvokeParameters(bool exact, bool reposition, bool caretMove)
6698    {
6699       EditLine line = editBox.line;
6700       char * text = line.text;
6701       int lineNum, charPos;
6702       Expression exp = null;
6703       EditLine l1, l2;
6704       int x1,y1, x2,y2;
6705
6706       if(!parsing) return;
6707
6708       charPos = editBox.charPos + 1;
6709       EnsureUpToDate();
6710
6711       editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
6712       {
6713          EditBoxStream f { editBox = editBox };
6714          char ch;
6715
6716          updatingCode = true;
6717          editBox.SetSelPos(l1, y1, x1, l2, y2, x2);
6718
6719          f.Getc(&ch);
6720          if(ch == '}' || ch == ',' || ch == ')')
6721          {
6722             f.Seek(-1, current);
6723             ch = ' ';
6724          }
6725          if(isspace(ch))
6726          {
6727             for(;;)
6728             {
6729                char ch;
6730                if(!f.Seek(-1, current))
6731                   break;
6732                f.Getc(&ch);
6733                if(!isspace(ch)) break;
6734                f.Seek(-1, current);
6735             }
6736          }
6737          else
6738             f.Seek(-1, current);
6739
6740          editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
6741
6742          lineNum = editBox.lineNumber + 1;
6743          charPos = editBox.charPos + 1;
6744          delete f;
6745          updatingCode = false;
6746       }
6747
6748       charPos = Min(charPos, l1.count + 1);
6749       if(!caretMove)
6750          FindParamsTree(ast, lineNum, charPos);
6751
6752       // Not sure about this == ExpCall... paramsInsideExp doesn't seem to necessarily be a ExpCall
6753       if(exact && ((::functionType && paramsInsideExp.type == callExp && paramsInsideExp.call.exp.loc.end.charPos != charPos-1) /*|| instanceType*/))
6754       {
6755          ::functionType = null;
6756          ::instanceType = null;
6757       }
6758
6759       //if((::functionType || ::instanceType) && (!paramsShown || insideExp != functionExp || ::paramsID != this.paramsID))
6760       if((::functionType || ::instanceType) && (!paramsShown || true /*paramsInsideExp.destType != functionExp.destType */|| ::paramsID != this.paramsID))
6761       {
6762
6763          int x, y;
6764          Window parent = paramsList.parent;
6765
6766          if(this.functionType != ::functionType || this.instanceType != ::instanceType)
6767             reposition = false;
6768
6769          if(!this.paramsShown || reposition || paramsInsideExp != functionExp || ::instanceType) // Added instanceType here, otherwise instance popups never reposition...
6770                                                                                                           // ( Dummy exp: always ends up with same memory)
6771          {
6772             editBox.GetSelPos(&l1, &y1, &x1, &l2, &y2, &x2, false);
6773             editBox.GetCaretPosition(paramsPosition);
6774             this.paramsPosition.y += editBox.GetCaretSize();
6775          }
6776
6777          FreeType(this.functionType);
6778          FreeType(this.instanceType);
6779
6780          this.functionType = ::functionType;
6781          this.instanceType = ::instanceType;
6782
6783          if(this.functionType) this.functionType.refCount++;
6784          if(this.instanceType) this.instanceType.refCount++;
6785
6786          this.paramsID = ::paramsID;
6787          functionExp = paramsInsideExp;
6788
6789          paramsList.master = this;
6790
6791          paramsList.Create();
6792
6793          x = paramsPosition.x + editBox.absPosition.x - app.desktop.absPosition.x - editBox.scroll.x;
6794          y = paramsPosition.y + editBox.absPosition.y - app.desktop.absPosition.y - editBox.scroll.y;
6795
6796          if(!this.membersAbove && ( this.membersListShown || y + paramsList.size.h > parent.clientSize.h) )
6797          {
6798             y -= editBox.GetCaretSize() + paramsList.clientSize.h;
6799             paramsAbove = true;
6800          }
6801          else
6802             paramsAbove = false;
6803          if(x + paramsList.size.w > parent.clientSize.w)
6804          {
6805             x = parent.clientSize.w - paramsList.size.w;
6806             if(x < 0) x = 0;
6807          }
6808
6809          paramsList.position = { x, y };
6810
6811          // Hack to keep caret shown
6812          {
6813             Point caret;
6814             editBox.GetCaretPosition(caret);
6815             editBox.SetCaret(caret.x, caret.y, editBox.GetCaretSize());
6816          }
6817
6818          this.paramsShown = true;
6819       }
6820       else if((!::functionType && !::instanceType) || reposition)
6821       {
6822          paramsList.Destroy(0);
6823          paramsShown = false;
6824
6825          FreeType(this.functionType);
6826          FreeType(this.instanceType);
6827          this.functionType = null;
6828          this.instanceType = null;
6829          this.paramsID = -1;
6830       }
6831
6832       SetCurrentContext(globalContext);
6833       SetThisClass(null);
6834    }
6835
6836    bool ViewDesigner()
6837    {
6838       if(designer)
6839       {
6840          designer.visible = true;
6841          designer.Activate();
6842       }
6843       return true;
6844    }
6845 };
6846
6847 CodeEditor NewCodeEditor(Window parent, WindowState state, bool modified)
6848 {
6849    CodeEditor document { state = state, parent = parent, modifiedDocument = modified };
6850    document.Create();
6851    return document;
6852 }
6853
6854 static int nofdigits(int v)
6855 {
6856    if(v == MININT) return 10 + 1;
6857    if(v < 0) return nofdigits(-v) + 1;
6858    if(v >= 10000)
6859    {
6860       if(v >= 10000000)
6861       {
6862          if(v >= 100000000)
6863          {
6864             if(v >= 1000000000)
6865                return 10;
6866             return 9;
6867          }
6868          return 8;
6869       }
6870       if(v >= 100000)
6871       {
6872          if(v >= 1000000)
6873             return 7;
6874          return 6;
6875       }
6876       return 5;
6877    }
6878    if(v >= 100)
6879    {
6880       if(v >= 1000)
6881          return 4;
6882       return 3;
6883    }
6884    if(v >= 10)
6885       return 2;
6886    return 1;
6887 }