Skip to content

Commit b8091fc

Browse files
NeverbirthNeverbirth
committed
Merge branch 'development' into 64bits
Conflicts: FlashDevelop/Utilities/PluginServices.cs PluginCore/ScintillaNet/ScintillaControl.cs PluginCore/ScintillaNet/Structs.cs
2 parents aa745f4 + 5c0b879 commit b8091fc

File tree

769 files changed

+160584
-155181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

769 files changed

+160584
-155181
lines changed

‎External/Plugins/AS2Context/Context.cs

Lines changed: 179 additions & 179 deletions
Large diffs are not rendered by default.

‎External/Plugins/AS2Context/PluginMain.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public Object Settings
8787
#region Required Methods
8888

8989
/// <summary>
90-
/// Initializes the plugin
91-
/// </summary>
90+
/// Initializes the plugin
91+
/// </summary>
9292
public void Initialize()
9393
{
9494
this.InitBasics();
@@ -278,10 +278,10 @@ public bool ValidateSDK(InstalledSDK sdk)
278278
static readonly private string[] MACROMEDIA_VERSIONS = {
279279
"\\Adobe\\Flash CS5\\",
280280
"\\Adobe\\Flash CS4\\",
281-
"\\Adobe\\Flash CS3\\",
282-
"\\Macromedia\\Flash 8\\",
283-
"\\Macromedia\\Flash MX 2004\\"
284-
};
281+
"\\Adobe\\Flash CS3\\",
282+
"\\Macromedia\\Flash 8\\",
283+
"\\Macromedia\\Flash MX 2004\\"
284+
};
285285

286286
/// <summary>
287287
/// Explore the possible locations for the Macromedia Flash IDE classpath

‎External/Plugins/AS3Context/AbcConverter.cs

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -627,12 +627,14 @@ public class ASDocItem
627627
{
628628
public bool IsFinal = false;
629629
public bool IsDynamic = false;
630+
public bool IsStatic = false;
630631

631632
public string ShortDesc = null;
632633
public string LongDesc = null;
633634
public string Returns = null;
634635
public string Value = null;
635636
public string ApiType = null;
637+
public string DeclType = null;
636638

637639
public List<ASMetaData> Meta;
638640
public Dictionary<string, string> Params = new Dictionary<string, string>();
@@ -670,10 +672,10 @@ public void Parse(Dictionary<string, ASDocItem> packageDocs)
670672

671673

672674
//---------------------------
673-
// PRIMARY
675+
// PRIMARY
674676
//---------------------------
675677

676-
private void ReadDeclaration()
678+
private void ReadDeclaration(string declType)
677679
{
678680
if (IsEmptyElement)
679681
return;
@@ -682,6 +684,8 @@ private void ReadDeclaration()
682684
this.ExcludedASDocs = new List<string>();
683685

684686
ASDocItem doc = new ASDocItem();
687+
doc.DeclType = declType;
688+
685689
string id = GetAttribute("id");
686690

687691
if (id != null)
@@ -732,7 +736,9 @@ private void ReadDeclaration()
732736
if (!this.ExcludedASDocs.Contains(extraASDoc.Key))
733737
doc.LongDesc += "\n@" + extraASDoc.Key + "\t" + extraASDoc.Value;
734738

735-
if (doc.ShortDesc.Length > 0 || doc.LongDesc.Length > 0)
739+
// keep definitions including either documentation or static values
740+
if (doc.ShortDesc.Length > 0 || doc.LongDesc.Length > 0
741+
|| (doc.IsStatic && doc.Value != null && doc.DeclType == "apiValue"))
736742
docs[id] = doc;
737743
}
738744
}
@@ -758,7 +764,7 @@ private void ProcessDeclarationNodes(ASDocItem doc)
758764
case "apiValue":
759765
case "apiOperation":
760766
case "apiConstructor":
761-
ReadDeclaration();
767+
ReadDeclaration(Name);
762768
break;
763769

764770
case "shortdesc": doc.ShortDesc = ReadValue(); break;
@@ -771,6 +777,8 @@ private void ProcessDeclarationNodes(ASDocItem doc)
771777
case "adobeApiEvent": ReadEventMeta(doc); break;
772778

773779
case "apiFinal": doc.IsFinal = true; SkipContents(); break;
780+
case "apiStatic":
781+
doc.IsStatic = true; break;
774782

775783
case "apiParam": ReadParamDesc(doc); break;
776784
case "apiReturn": ReadReturnsDesc(doc); break;
@@ -785,7 +793,7 @@ private void ProcessDeclarationNodes(ASDocItem doc)
785793

786794

787795
//---------------------------
788-
// COMMONS
796+
// COMMONS
789797
//---------------------------
790798

791799
private void SkipContents()
@@ -854,7 +862,7 @@ private string ReadValue()
854862

855863

856864
//---------------------------
857-
// apiClassifierDetail
865+
// apiClassifierDetail
858866
//---------------------------
859867

860868
private void ReadApiClassifierDetail(ASDocItem doc)
@@ -912,28 +920,28 @@ private void ReadApiClassifierDef(ASDocItem doc)
912920

913921

914922
//---------------------------
915-
// prolog
923+
// prolog
916924
//---------------------------
917925

918926
/// <summary>
919927
/// ---
920928
/// Example:
921929
/// <prolog>
922-
/// <asMetadata>
923-
/// <apiVersion>
924-
/// <apiLanguage version="3.0" />
925-
/// <apiPlatform description="" name="Flash" version="10" />
926-
/// <apiPlatform description="" name="AIR" version="1.5" />
927-
/// <apiTool description="" name="Flex" version="3" />
928-
/// </apiVersion>
929-
/// </asMetadata>
930-
/// <asCustoms>
931-
/// <customAsDoc>
932-
/// <type c="String" />
933-
/// </customAsDoc>
934-
/// </asCustoms>
935-
/// </prolog>
936-
/// ---
930+
/// <asMetadata>
931+
/// <apiVersion>
932+
/// <apiLanguage version="3.0" />
933+
/// <apiPlatform description="" name="Flash" version="10" />
934+
/// <apiPlatform description="" name="AIR" version="1.5" />
935+
/// <apiTool description="" name="Flex" version="3" />
936+
/// </apiVersion>
937+
/// </asMetadata>
938+
/// <asCustoms>
939+
/// <customAsDoc>
940+
/// <type c="String" />
941+
/// </customAsDoc>
942+
/// </asCustoms>
943+
/// </prolog>
944+
/// ---
937945
/// </summary>
938946
/// <param name="doc"></param>
939947
private void ReadProlog(ASDocItem doc)
@@ -1066,7 +1074,7 @@ private void ReadPrologCustoms(ASDocItem doc, string terminationNode)
10661074

10671075

10681076
//---------------------------
1069-
// apiType
1077+
// apiType
10701078
//---------------------------
10711079

10721080
private void ReadApiType(ASDocItem doc)
@@ -1086,7 +1094,7 @@ private void SetApiType(ASDocItem doc, string apiType)
10861094

10871095

10881096
//---------------------------
1089-
// apiOperationDetail
1097+
// apiOperationDetail
10901098
//---------------------------
10911099

10921100
private void ReadParamDesc(ASDocItem doc)
@@ -1162,7 +1170,7 @@ private void ReadReturnsDesc(ASDocItem doc)
11621170

11631171

11641172
//---------------------------
1165-
// apiException
1173+
// apiException
11661174
//---------------------------
11671175

11681176
private void ReadApiException(ASDocItem doc)
@@ -1200,7 +1208,7 @@ private void ReadApiException(ASDocItem doc)
12001208

12011209

12021210
//---------------------------
1203-
// Meta tags
1211+
// Meta tags
12041212
//---------------------------
12051213

12061214
private void ReadExcludeMeta(ASDocItem doc)

‎External/Plugins/AS3Context/Compiler/FdbWrapper.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ bool Initialize(string flexSDKPath, Dictionary<string, string> jvmConfig, string
8181
process.StartInfo.RedirectStandardError = true;
8282
process.StartInfo.CreateNoWindow = true;
8383
process.StartInfo.FileName = JvmConfigHelper.GetJavaEXE(jvmConfig);
84-
process.StartInfo.Arguments = jvmConfig["java.args"]
85-
+ " -Dfile.encoding=UTF-8 -Dapplication.home=\"" + flexSDKPath + "\" -jar \"" + fdbPath + "\"";
84+
process.StartInfo.Arguments = jvmConfig["java.args"] + " -Dfile.encoding=UTF-8 -Dapplication.home=\"" + flexSDKPath + "\" -jar \"" + fdbPath + "\"";
8685
process.StartInfo.WorkingDirectory = workingDir;
8786
process.StartInfo.StandardErrorEncoding = Encoding.UTF8;
8887
process.StartInfo.StandardOutputEncoding = Encoding.UTF8;

0 commit comments

Comments
 (0)