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