hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-21 02:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
Malayke
2023-12-18 18:38:20 +08:00
committed by GitHub
parent 8d8126f849 d8fdba009a
commit c90fcd19cc
4 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/StubVisitor.cs
View File

@@ -80,11 +80,11 @@ internal sealed class StubVisitor : SymbolVisitor
stubWriter.Write(explicitInterfaceType.GetQualifiedName());
stubWriter.Write('.');
if (writeName)
stubWriter.Write(explicitInterfaceSymbol.GetName());
stubWriter.Write(EscapeIdentifier(explicitInterfaceSymbol.GetName()));
}
else if (writeName)
{
stubWriter.Write(symbol.GetName());
stubWriter.Write(EscapeIdentifier(symbol.GetName()));
}
}
@@ -557,6 +557,9 @@ internal sealed class StubVisitor : SymbolVisitor
});
}
private static bool ExcludeMethod(IMethodSymbol symbol) =>
symbol.Name == "<Clone>$";
private void StubMethod(IMethodSymbol symbol, IMethodSymbol? explicitInterfaceSymbol, IMethodSymbol? baseCtor)
{
var methodKind = explicitInterfaceSymbol is null ? symbol.MethodKind : explicitInterfaceSymbol.MethodKind;
@@ -568,7 +571,7 @@ internal sealed class StubVisitor : SymbolVisitor
MethodKind.Ordinary
};
if (!relevantMethods.Contains(methodKind))
if (!relevantMethods.Contains(methodKind) || ExcludeMethod(symbol))
return;
StubAttributes(symbol.GetAttributes());

20
csharp/extractor/Semmle.Extraction.Tests/StubGenerator.cs
View File

@@ -76,6 +76,26 @@ public int M1(ref readonly Guid guid) => throw null;
Assert.Equal(expected, stub);
}
[Fact]
public void StubGeneratorEscapeMethodName()
{
// Setup
const string source = @"
public class MyTest {
public int @default() { return 0; }
}";
// Execute
var stub = GenerateStub(source);
// Verify
const string expected = @"public class MyTest {
public int @default() => throw null;
}
";
Assert.Equal(expected, stub);
}
private static string GenerateStub(string source)
{
var st = CSharpSyntaxTree.ParseText(source);

15
csharp/ql/test/resources/stubs/ServiceStack.Common/8.0.0/ServiceStack.Common.cs
View File

@@ -1436,10 +1436,14 @@ namespace ServiceStack
public long decrBy(long value, long by) => throw null;
public long decrement(long value) => throw null;
public long decrementBy(long value, long by) => throw null;
public object @default(object returnTarget, object elseReturn) => throw null;
public string dirPath(string filePath) => throw null;
public System.Collections.Generic.IEnumerable<object> distinct(System.Collections.Generic.IEnumerable<object> items) => throw null;
public double div(double lhs, double rhs) => throw null;
public double divide(double lhs, double rhs) => throw null;
public object @do(ServiceStack.Script.ScriptScopeContext scope, object expression) => throw null;
public System.Threading.Tasks.Task @do(ServiceStack.Script.ScriptScopeContext scope, object target, object expression) => throw null;
public System.Threading.Tasks.Task @do(ServiceStack.Script.ScriptScopeContext scope, object target, object expression, object scopeOptions) => throw null;
public object doIf(object test) => throw null;
public object doIf(object ignoreTarget, object test) => throw null;
public double doubleAdd(double lhs, double rhs) => throw null;
@@ -1558,6 +1562,8 @@ namespace ServiceStack
public string httpPathInfo(ServiceStack.Script.ScriptScopeContext scope) => throw null;
public string httpRequestUrl(ServiceStack.Script.ScriptScopeContext scope) => throw null;
public string humanize(string text) => throw null;
public object @if(object test) => throw null;
public object @if(object returnTarget, object test) => throw null;
public object ifDebug(ServiceStack.Script.ScriptScopeContext scope, object ignoreTarget) => throw null;
public object ifDebug(ServiceStack.Script.ScriptScopeContext scope) => throw null;
public object ifDo(object test) => throw null;
@@ -1840,6 +1846,9 @@ namespace ServiceStack
public object resolveContextArg(ServiceStack.Script.ScriptScopeContext scope, string name) => throw null;
public object resolveGlobal(ServiceStack.Script.ScriptScopeContext scope, string name) => throw null;
public object resolvePageArg(ServiceStack.Script.ScriptScopeContext scope, string name) => throw null;
public ServiceStack.Script.StopExecution @return(ServiceStack.Script.ScriptScopeContext scope) => throw null;
public ServiceStack.Script.StopExecution @return(ServiceStack.Script.ScriptScopeContext scope, object returnValue) => throw null;
public ServiceStack.Script.StopExecution @return(ServiceStack.Script.ScriptScopeContext scope, object returnValue, System.Collections.Generic.Dictionary<string, object> returnArgs) => throw null;
public System.Collections.Generic.IEnumerable<object> reverse(ServiceStack.Script.ScriptScopeContext scope, System.Collections.Generic.IEnumerable<object> original) => throw null;
public string rightPart(string text, string needle) => throw null;
public double round(double value) => throw null;
@@ -1930,6 +1939,8 @@ namespace ServiceStack
public System.Collections.Generic.IEnumerable<object> thenByDescending(ServiceStack.Script.ScriptScopeContext scope, object target, object expression) => throw null;
public System.Collections.Generic.IEnumerable<object> thenByDescending(ServiceStack.Script.ScriptScopeContext scope, object target, object expression, object scopeOptions) => throw null;
public static System.Collections.Generic.IEnumerable<object> thenByInternal(string filterName, ServiceStack.Script.ScriptScopeContext scope, object target, object expression, object scopeOptions) => throw null;
public object @throw(ServiceStack.Script.ScriptScopeContext scope, string message) => throw null;
public object @throw(ServiceStack.Script.ScriptScopeContext scope, string message, object options) => throw null;
public object throwArgumentException(ServiceStack.Script.ScriptScopeContext scope, string message) => throw null;
public object throwArgumentException(ServiceStack.Script.ScriptScopeContext scope, string message, string options) => throw null;
public object throwArgumentNullException(ServiceStack.Script.ScriptScopeContext scope, string paramName) => throw null;
@@ -3163,6 +3174,7 @@ namespace ServiceStack
public ProtectedScripts() => throw null;
public ServiceStack.Script.IgnoreResult Decrypt(string path) => throw null;
public ServiceStack.Script.IgnoreResult Decrypt(ServiceStack.Script.FileScripts fs, string path) => throw null;
public object @default(string typeName) => throw null;
public ServiceStack.Script.IgnoreResult Delete(string path) => throw null;
public ServiceStack.Script.IgnoreResult Delete(ServiceStack.Script.IOScript os, string path) => throw null;
public string deleteDirectory(string virtualPath) => throw null;
@@ -3253,6 +3265,8 @@ namespace ServiceStack
public ServiceStack.Script.IgnoreResult Move(string from, string to) => throw null;
public ServiceStack.Script.IgnoreResult Move(ServiceStack.Script.IOScript os, string from, string to) => throw null;
public string mv(ServiceStack.Script.ScriptScopeContext scope, string from, string to) => throw null;
public object @new(string typeName) => throw null;
public object @new(string typeName, System.Collections.Generic.List<object> constructorArgs) => throw null;
public string osPaths(string path) => throw null;
public string proc(ServiceStack.Script.ScriptScopeContext scope, string fileName) => throw null;
public string proc(ServiceStack.Script.ScriptScopeContext scope, string fileName, System.Collections.Generic.Dictionary<string, object> options) => throw null;
@@ -3284,6 +3298,7 @@ namespace ServiceStack
public string textContents(ServiceStack.IO.IVirtualFile file) => throw null;
public string touch(ServiceStack.Script.ScriptScopeContext scope, string target) => throw null;
public static string TypeNotFoundErrorMessage(string typeName) => throw null;
public System.Type @typeof(string typeName) => throw null;
public System.Type typeofProgId(string name) => throw null;
public string typeQualifiedName(System.Type type) => throw null;
public System.ReadOnlyMemory<byte> urlBytesContents(ServiceStack.Script.ScriptScopeContext scope, string url, object options) => throw null;

4
csharp/scripts/stubs/helpers.py
View File

@@ -3,6 +3,7 @@ import os
import subprocess
import json
import shutil
import re
def run_cmd(cmd, msg="Failed to run command"):
print('Running ' + ' '.join(cmd))
@@ -191,7 +192,8 @@ class Generator:
if 'dependencies' in data['targets'][target][package]:
for dependency in data['targets'][target][package]['dependencies'].keys():
depVersion = data['targets'][target][package]['dependencies'][dependency]
depString = data['targets'][target][package]['dependencies'][dependency]
depVersion = re.search("(\d+\.\d+\.\d+(-[a-z]+)?)", depString).group(0)
pf.write(' <ProjectReference Include="../../' +
dependency + '/' + depVersion + '/' + dependency + '.csproj" />\n')