github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 06:05:58 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Support for clang-format without proper file option (before v. 14)

Browse source
This commit is contained in:
Mirek Fidler 2023-02-19 19:27:38 +01:00
parent f7ebcbd97b
commit 06e12af643
4 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/Days/Days.lay
View file

@ -1,8 +1,8 @@
LAYOUT(DaysLayout, 320, 64) LAYOUT(DaysLayout, 320, 64)
ITEM(EditDate, date1, LeftPosZ(52, 100).TopPosZ(8, 19)) ITEM(Upp::EditDate, date1, LeftPosZ(52, 100).TopPosZ(8, 19))
ITEM(Label, dv___1, SetLabel(t_("Date 1")).LeftPosZ(8, 40).TopPosZ(8, 19)) ITEM(Upp::Label, dv___1, SetLabel(t_("Date 1")).LeftPosZ(8, 40).TopPosZ(8, 19))
ITEM(EditDate, date2, LeftPosZ(212, 100).TopPosZ(8, 19)) ITEM(Upp::EditDate, date2, LeftPosZ(212, 100).TopPosZ(8, 19))
ITEM(Label, dv___3, SetLabel(t_("Date 2")).LeftPosZ(168, 40).TopPosZ(8, 19)) ITEM(Upp::Label, dv___3, SetLabel(t_("Date 2")).LeftPosZ(168, 40).TopPosZ(8, 19))
ITEM(Label, result, LeftPosZ(8, 304).TopPosZ(36, 19)) ITEM(Upp::Label, result, LeftPosZ(8, 304).TopPosZ(36, 19))
END_LAYOUT END_LAYOUT

2
uppbox/uppweb/www.tpp/documentation_en-us.tpp
View file

@ -52,8 +52,6 @@ Packages and Assemblies]&]
[s0;l160; [^topic`:`/`/ide`/app`/CommandLineArugments`_en`-us^ Command [s0;l160; [^topic`:`/`/ide`/app`/CommandLineArugments`_en`-us^ Command
line arguments]&] line arguments]&]
[s0;l160; [^topic`:`/`/ide`/app`/Assist`$en`-us^ Assist`+`+]&] [s0;l160; [^topic`:`/`/ide`/app`/Assist`$en`-us^ Assist`+`+]&]
[s0;l160; [^topic`:`/`/ide`/app`/AssistParserDirectives`_en`-us^ Assist`+`+
`- parser directives]&]
[s0;l160; [^topic`:`/`/ide`/app`/Blitz`_en`-us^ BLITZ]&] [s0;l160; [^topic`:`/`/ide`/app`/Blitz`_en`-us^ BLITZ]&]
[s0;l160; [^topic`:`/`/ide`/app`/Files`$en`-us^ File types]&] [s0;l160; [^topic`:`/`/ide`/app`/Files`$en`-us^ File types]&]
[s0;l160; [^topic`:`/`/ide`/app`/Keys`$en`-us^ Keys]&] [s0;l160; [^topic`:`/`/ide`/app`/Keys`$en`-us^ Keys]&]

8
uppbox/uppweb/www.tpp/documentation_en-us.tppi
View file

@ -5,8 +5,8 @@ COMPRESSED
36,155,174,24,231,251,24,228,136,203,19,95,40,9,36,190,82,96,0,6,184,207,57,183,60,252,32,50,240,210,84,7,7,132,38,136,214,125,171,174,70,92,157,184,168,98,100,202,87,228,222,151,196,159,0,253,194,177,108,228,65,180,234,130,88,23,15,192,59,23,30,253,111,152,231,246,136,163,29,0,145,219,54,226,150,160,90,120,136,221,6,247,178,169,112,238,122,227,23,122,93,93,6,70,119,5,115,122,241,160,173,52,238,140,184,115,98,145,190,237,249,72,32,87,196,159,84,202,23,190,148,182,240,109,233,88,224,177,170,19,211,41,83,71,53,221,184,51,226,142,184,139,222,66,172,182,141,232,27,53,68,238,114,130,34,60,223,33,22,58,35,179,71,73,156,17,14,84,198,164,45,134,211,139,135,156,187,100,200,67,195,120,158,99,73,31,100,128,3,203,70,165,99,63,240,144,104,228,89,160,13,104,67,8,239,130,165,158,61,234,154,53,240,26,20,84,76,214,55,254,141,47,245,34,104,34,249,231,219,127,253,245,201,139,71,55,215,236,182,18,19,118,153,135,53,85, 36,155,174,24,231,251,24,228,136,203,19,95,40,9,36,190,82,96,0,6,184,207,57,183,60,252,32,50,240,210,84,7,7,132,38,136,214,125,171,174,70,92,157,184,168,98,100,202,87,228,222,151,196,159,0,253,194,177,108,228,65,180,234,130,88,23,15,192,59,23,30,253,111,152,231,246,136,163,29,0,145,219,54,226,150,160,90,120,136,221,6,247,178,169,112,238,122,227,23,122,93,93,6,70,119,5,115,122,241,160,173,52,238,140,184,115,98,145,190,237,249,72,32,87,196,159,84,202,23,190,148,182,240,109,233,88,224,177,170,19,211,41,83,71,53,221,184,51,226,142,184,139,222,66,172,182,141,232,27,53,68,238,114,130,34,60,223,33,22,58,35,179,71,73,156,17,14,84,198,164,45,134,211,139,135,156,187,100,200,67,195,120,158,99,73,31,100,128,3,203,70,165,99,63,240,144,104,228,89,160,13,104,67,8,239,130,165,158,61,234,154,53,240,26,20,84,76,214,55,254,141,47,245,34,104,34,249,231,219,127,253,245,201,139,71,55,215,236,182,18,19,118,153,135,53,85,
73,64,155,198,223,166,183,149,61,97,47,51,102,86,113,197,10,56,99,155,188,102,97,144,177,69,156,69,44,234,75,179,69,94,178,155,217,195,217,67,182,64,113,232,117,94,222,157,177,43,195,160,154,151,203,32,139,255,212,17,44,233,20,226,97,144,36,155,51,246,36,8,87,44,13,222,65,179,139,134,173,130,138,5,44,210,17,100,12,20,42,29,146,245,51,246,34,55,76,223,235,114,3,48,217,146,172,110,221,67,10,74,107,205,214,65,102,206,216,211,124,77,114,35,22,213,37,73,194,37,67,239,24,182,208,107,182,209,65,217,200,174,130,123,13,215,145,102,85,188,204,226,5,220,101,134,21,101,190,68,126,42,22,103,44,204,97,133,12,172,87,168,59,86,153,32,206,42,96,206,222,229,27,226,161,100,165,14,34,8,252,165,35,234,106,209,208,211,80,99,86,129,97,85,158,234,29,218,52,174,42,250,24,224,45,137,53,0,222,215,186,162,240,96,183,165,46,204,211,180,206,98,179,33,21,178,191,97,38,39,88,247,49,160,234,15,161,78,18,132,204,170,186,40,242,210, 73,64,155,198,223,166,183,149,61,97,47,51,102,86,113,197,10,56,99,155,188,102,97,144,177,69,156,69,44,234,75,179,69,94,178,155,217,195,217,67,182,64,113,232,117,94,222,157,177,43,195,160,154,151,203,32,139,255,212,17,44,233,20,226,97,144,36,155,51,246,36,8,87,44,13,222,65,179,139,134,173,130,138,5,44,210,17,100,12,20,42,29,146,245,51,246,34,55,76,223,235,114,3,48,217,146,172,110,221,67,10,74,107,205,214,65,102,206,216,211,124,77,114,35,22,213,37,73,194,37,67,239,24,182,208,107,182,209,65,217,200,174,130,123,13,215,145,102,85,188,204,226,5,220,101,134,21,101,190,68,126,42,22,103,44,204,97,133,12,172,87,168,59,86,153,32,206,42,96,206,222,229,27,226,161,100,165,14,34,8,252,165,35,234,106,209,208,211,80,99,86,129,97,85,158,234,29,218,52,174,42,250,24,224,45,137,53,0,222,215,186,162,240,96,183,165,46,204,211,180,206,98,179,33,21,178,191,97,38,39,88,247,49,160,234,15,161,78,18,132,204,170,186,40,242,210,
176,60,107,226,187,125,179,50,166,152,141,103,231,179,243,245,122,61,59,67,114,99,16,173,139,98,118,6,246,103,231,200,78,157,86,179,243,55,172,249,52,61,35,208,114,194,110,21,187,202,16,91,146,180,89,36,120,23,121,182,136,151,117,217,172,76,187,232,232,143,53,105,202,149,221,158,190,49,121,17,135,173,67,32,155,157,7,240,116,30,183,150,102,111,215,113,38,197,236,173,206,102,143,234,234,141,100,127,208,243,161,163,101,13,189,233,119,89,45,242,42,254,208,179,250,234,229,245,213,223,255,107,171,105,16,230,85,207,42,158,95,94,127,195,234,0,155,61,139,199,225,32,139,107,61,111,115,118,190,203,253,236,193,78,181,173,138,186,162,214,160,212,68,40,237,36,47,168,236,89,184,9,19,221,195,102,79,190,195,52,219,231,255,245,74,95,93,62,57,236,253,47,24,220,135,249,84,39,197,43,218,122,14,140,237,34,252,178,210,175,218,24,212,255,181,9,74,116,236,94,181,91,167,254,162,23,108,29,155,85,7,105,58,196,44,133,191,227,122,27,203,92,47,227,44,211, 176,60,107,226,187,125,179,50,166,152,141,103,231,179,243,245,122,61,59,67,114,99,16,173,139,98,118,6,246,103,231,200,78,157,86,179,243,55,172,249,52,61,35,208,114,194,110,21,187,202,16,91,146,180,89,36,120,23,121,182,136,151,117,217,172,76,187,232,232,143,53,105,202,149,221,158,190,49,121,17,135,173,67,32,155,157,7,240,116,30,183,150,102,111,215,113,38,197,236,173,206,102,143,234,234,141,100,127,208,243,161,163,101,13,189,233,119,89,45,242,42,254,208,179,250,234,229,245,213,223,255,107,171,105,16,230,85,207,42,158,95,94,127,195,234,0,155,61,139,199,225,32,139,107,61,111,115,118,190,203,253,236,193,78,181,173,138,186,162,214,160,212,68,40,237,36,47,168,236,89,184,9,19,221,195,102,79,190,195,52,219,231,255,245,74,95,93,62,57,236,253,47,24,220,135,249,84,39,197,43,218,122,14,140,237,34,252,178,210,175,218,24,212,255,181,9,74,116,236,94,181,91,167,254,162,23,108,29,155,85,7,105,58,196,44,133,191,227,122,27,203,92,47,227,44,211,
229,151,234,225,203,118,94,181,251,79,245,115,85,233,116,158,196,248,148,69,47,208,157,213,30,234,86,102,196,246,82,77,86,26,185,33,94,182,157,133,128,63,119,184,119,212,19,219,57,109,28,237,133,135,121,75,83,104,61,195,65,243,115,89,47,41,185,251,66,103,221,91,70,231,16,11,202,101,147,252,65,118,129,34,174,204,30,110,247,140,74,29,174,253,10,251,176,46,47,49,149,96,127,191,215,61,92,123,107,108,246,8,231,2,201,177,104,39,56,196,197,227,36,54,127,238,45,62,126,118,245,250,31,67,244,126,137,147,126,26,232,145,153,77,49,204,233,111,122,211,211,165,167,65,46,147,96,217,83,123,92,199,73,196,22,180,56,68,251,117,179,184,211,110,31,7,230,1,123,84,153,247,92,63,111,158,135,104,54,146,207,131,12,101,89,238,89,110,86,89,183,60,196,204,179,0,231,160,185,236,231,190,93,98,88,195,161,124,104,5,99,170,245,145,227,198,116,204,220,85,152,103,151,253,244,209,194,127,102,170,42,116,24,7,201,222,212,117,187,128,17,34,48,117,121,88, 229,151,234,225,203,118,94,181,251,79,245,115,85,233,116,158,196,248,148,69,47,208,157,213,30,234,86,102,196,246,82,77,86,26,185,33,94,182,157,133,128,63,119,184,119,212,19,219,57,109,28,237,133,135,121,75,83,104,61,195,65,243,115,89,47,41,185,251,66,103,221,91,70,231,16,11,202,101,147,252,65,118,129,34,174,204,30,110,247,140,74,29,162,253,56,137,205,159,123,24,143,159,93,189,254,199,16,189,95,226,164,207,17,61,50,179,41,134,81,241,155,222,244,116,233,105,144,203,36,88,246,212,30,215,113,18,177,5,45,14,209,126,221,44,238,180,219,199,129,36,97,3,41,243,158,235,231,205,243,16,205,70,242,121,144,161,102,202,61,203,205,42,235,150,135,152,121,22,224,144,50,151,186,87,48,237,18,195,26,78,204,67,43,152,33,173,143,28,215,153,99,230,174,194,60,187,236,167,143,22,254,51,83,85,161,195,56,72,246,166,174,219,5,156,239,129,169,203,195,122,248,166,181,159,163,251,32,11,117,244,187,46,146,32,236,109,105,219,23,40,52,52,9,53,74,39,
15,223,180,246,115,116,31,100,161,142,126,215,69,18,132,189,93,115,251,2,133,134,62,164,94,236,68,134,213,106,22,81,129,246,203,53,139,154,157,148,192,98,160,193,36,130,250,197,36,131,241,225,29,186,135,253,208,248,33,165,31,135,120,136,83,26,49,112,45,235,81,218,44,145,19,44,235,50,3,37,73,60,47,131,146,118,66,120,170,48,22,133,154,70,140,244,192,195,240,13,248,181,78,65,129,233,231,177,61,3,187,1,241,124,27,140,217,10,14,9,5,135,225,17,123,45,73,116,137,44,227,98,119,242,125,7,238,58,189,235,153,126,254,27,109,90,97,127,107,157,83,75,15,235,136,155,162,120,90,207,247,237,208,62,147,197,32,138,98,66,7,194,139,237,129,176,40,243,180,153,254,174,50,202,133,54,131,206,4,244,120,133,173,191,104,189,44,231,240,210,204,165,221,201,217,140,223,141,16,90,103,63,107,188,206,243,228,123,153,193,1,90,230,113,244,184,141,127,79,210,31,184,25,52,115,53,157,244,157,208,1,75,187,105,19,211,146,234,210,245,18,195,248,125,172,215, 50,172,86,179,136,10,180,95,174,89,212,108,115,4,22,211,6,198,4,212,47,198,12,156,237,239,48,227,176,31,26,63,164,244,227,16,15,113,74,231,63,238,76,61,74,155,37,114,130,101,93,102,160,36,137,231,101,80,210,54,5,79,21,102,150,80,211,249,159,30,120,24,190,59,190,214,41,40,48,253,60,182,7,84,55,189,157,111,131,49,91,193,33,161,224,164,58,98,175,37,137,110,120,101,92,236,142,165,239,192,93,167,119,61,211,207,127,99,179,71,205,136,181,219,247,230,212,210,195,58,226,166,40,158,214,243,125,59,180,207,100,49,136,162,152,208,129,240,98,187,91,47,202,60,109,70,179,171,140,114,161,205,160,13,27,61,94,97,95,46,90,47,203,57,188,52,67,99,119,172,53,179,113,35,132,214,217,15,2,175,243,60,249,94,102,112,186,149,121,28,61,110,227,223,147,244,7,198,246,102,232,165,99,184,19,58,96,105,55,10,98,148,81,93,186,94,98,82,190,143,245,186,3,33,143,3,56,152,74,242,78,109,239,253,19,67,141,129,239,80,255,63,141,33,148,99,
29,8,121,28,192,193,224,147,119,106,123,239,159,24,106,12,124,135,250,255,105,210,161,28,83,42,227,204,148,121,84,55,119,30,154,252,105,13,219,88,168,11,131,107,212,162,19,63,251,95,13,70,109,177,102,128,85,183,147,110,119,211,160,102,166,38,110,23,87,249,154,176,84,121,114,175,155,218,110,5,231,137,78,171,227,80,46,242,18,88,170,50,196,61,13,39,85,109,242,242,96,79,165,247,108,187,252,85,2,22,121,157,69,13,148,10,1,172,218,251,149,238,93,51,143,99,48,101,242,44,158,127,13,198,175,55,87,135,40,18,92,17,119,49,55,101,201,150,101,80,172,232,210,138,73,28,220,197,212,111,11,236,211,85,155,67,2,211,84,233,113,32,151,101,176,222,163,160,167,207,145,208,234,33,148,165,54,236,46,203,215,137,142,104,254,159,211,217,24,65,138,170,40,172,43,131,254,167,236,81,131,226,234,65,55,68,188,138,128,28,23,106,122,81,230,201,80,72,87,233,242,115,68,87,41,237,144,7,144,194,149,14,239,24,1,161,168,83,29,174,112,179,175,210,126,94, 74,101,156,153,50,143,234,230,66,66,99,57,173,97,27,11,117,97,112,199,89,116,226,103,255,171,169,165,45,214,12,176,234,118,12,237,174,1,212,204,212,196,237,226,42,95,19,150,42,79,238,117,83,219,173,224,60,209,105,117,28,202,69,94,2,75,85,134,184,68,225,164,170,77,94,30,236,169,244,158,109,151,191,74,192,34,175,179,168,129,82,33,128,85,123,249,209,189,59,224,113,12,166,76,158,197,243,175,193,248,245,230,234,16,69,130,251,219,46,230,166,44,217,178,12,138,21,221,40,49,38,131,187,152,250,109,129,125,186,106,115,72,96,154,42,61,14,228,178,12,214,123,20,244,244,57,18,90,61,132,178,212,134,221,101,249,58,209,17,13,231,115,58,27,35,72,81,21,133,117,101,208,255,148,61,106,80,220,11,232,250,134,87,17,144,227,182,75,47,202,60,25,10,233,42,93,126,142,232,42,165,29,242,0,82,184,210,225,29,35,32,20,117,170,195,21,174,221,85,218,207,75,220,104,97,3,140,139,186,189,221,28,7,113,253,62,217,99,48,159,1,192,235,67,247,159,
226,70,11,27,96,92,212,237,5,234,56,136,235,247,201,30,131,249,12,0,94,31,186,255,180,60,234,102,239,66,113,4,244,181,90,155,15,156,67,159,126,15,113,164,215,191,225,125,32,117,55,171,8,187,216,101,80,222,161,201,210,94,207,93,183,151,116,66,120,243,244,18,51,108,133,19,107,211,78,242,36,222,124,27,162,143,109,68,195,193,97,2,225,150,80,95,237,191,237,53,162,199,173,1,142,160,140,58,178,118,231,202,241,83,164,223,77,116,217,141,244,135,189,185,103,24,218,105,135,194,253,23,89,64,189,30,222,37,6,219,25,182,175,211,23,183,149,217,244,199,159,139,188,157,126,104,245,11,199,200,150,128,233,116,250,111,233,60,175,68, 150,71,221,236,93,40,142,128,190,243,106,243,129,115,232,211,47,9,142,244,250,55,188,15,164,238,102,21,97,23,187,12,202,59,52,89,218,235,185,235,246,6,77,8,111,158,94,178,40,174,112,98,109,218,49,155,196,155,175,42,244,177,141,104,56,56,76,32,220,18,234,171,253,183,157,241,123,220,26,224,8,202,168,35,107,119,174,28,63,69,250,221,68,55,209,72,127,216,155,123,134,249,156,118,40,92,78,145,5,212,235,225,160,63,216,206,176,125,157,190,85,173,204,166,63,254,92,228,237,244,67,171,95,56,70,182,4,76,167,211,127,3,140,40,139,248,

6
uppsrc/ide/FormatCode.cpp
View file

@ -138,7 +138,7 @@ String ReformatCpp(CodeEditor& editor, bool setcursor, bool prefer_clang_format)
int64 l, h; int64 l, h;
bool sel = editor.GetSelection(l, h); bool sel = editor.GetSelection(l, h);
String cmd = "clang-format "; String cmd = "clang-format --style=file ";
if(sel) { if(sel) {
l = editor.GetLine(l) + 1; l = editor.GetLine(l) + 1;
h = editor.GetLine(h) + 1; h = editor.GetLine(h) + 1;
@ -154,9 +154,9 @@ String ReformatCpp(CodeEditor& editor, bool setcursor, bool prefer_clang_format)
return "Failed to save temporary file " + temp_path; return "Failed to save temporary file " + temp_path;
} }
} }
cmd << "\"--style=file:" << clang_format_path << "\" ";
SaveChangedFile(CacheFile(".clang-format"), LoadFile(clang_format_path));
String r; String r;
int code = HostSys(cmd + temp_path, r); int code = HostSys(cmd + temp_path, r);