Merge pull request #52 from eirannejad/master

daren-thomas · web-flow · commit 2b1264fb03e5 · 2017-04-19T13:50:51.000+02:00
Better Code Completion Results
diff --git a/PythonConsoleControl/PythonConsoleCompletionDataProvider.cs b/PythonConsoleControl/PythonConsoleCompletionDataProvider.cs
@@ -57,13 +57,14 @@ public ICompletionData[] GenerateCompletionData(string line)
                     //IList<string> members = commandLine.ScriptScope.Engine.Operations.GetMemberNames(value);
                     Type type = TryGetType(name);
                     // Use Reflection for everything except in-built Python types and COM pbjects. 
-                    if (type != null && type.Namespace != "IronPython.Runtime" && (type.Name != "__ComObject"))
+                    if (type != null && type.Namespace != "IronPython.Runtime" && !type.FullName.Contains("IronPython.NewTypes") && (type.Name != "__ComObject"))
                     {
                         PopulateFromCLRType(items, type, name);
                     }
                     else
                     {
-                        string dirCommand = "dir(" + name + ")";
+                        //string dirCommand = "dir(" + name + ")";
+                        string dirCommand = "sorted([m for m in dir(" + name + ") if not m.startswith('__')], key = str.lower) + sorted([m for m in dir(" + name + ") if m.startswith('__')])";
                         object value = commandLine.ScriptScope.Engine.CreateScriptSourceFromString(dirCommand, SourceCodeKind.Expression).Execute(commandLine.ScriptScope);
                         AutocompletionInProgress = false;
                         foreach (object member in (value as IronPython.Runtime.List))

Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,14 @@ public ICompletionData[] GenerateCompletionData(string line)`
`57`	`57`	`//IList<string> members = commandLine.ScriptScope.Engine.Operations.GetMemberNames(value);`
`58`	`58`	`Type type = TryGetType(name);`
`59`	`59`	`// Use Reflection for everything except in-built Python types and COM pbjects.`
`60`		`- if (type != null && type.Namespace != "IronPython.Runtime" && (type.Name != "__ComObject"))`
	`60`	`+ if (type != null && type.Namespace != "IronPython.Runtime" && !type.FullName.Contains("IronPython.NewTypes") && (type.Name != "__ComObject"))`
`61`	`61`	`{`
`62`	`62`	`PopulateFromCLRType(items, type, name);`
`63`	`63`	`}`
`64`	`64`	`else`
`65`	`65`	`{`
`66`		`- string dirCommand = "dir(" + name + ")";`
	`66`	`+ //string dirCommand = "dir(" + name + ")";`
	`67`	`+ string dirCommand = "sorted([m for m in dir(" + name + ") if not m.startswith('__')], key = str.lower) + sorted([m for m in dir(" + name + ") if m.startswith('__')])";`
`67`	`68`	`object value = commandLine.ScriptScope.Engine.CreateScriptSourceFromString(dirCommand, SourceCodeKind.Expression).Execute(commandLine.ScriptScope);`
`68`	`69`	`AutocompletionInProgress = false;`
`69`	`70`	`foreach (object member in (value as IronPython.Runtime.List))`