From 161b94e6affd11d8105584b9eb9bccce3e63c4da Mon Sep 17 00:00:00 2001 From: williamfzc <178894043@qq.com> Date: Sat, 15 Apr 2023 16:29:38 +0800 Subject: [PATCH 1/5] fake commit --- cmd/srctx/main.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/srctx/main.go b/cmd/srctx/main.go index ade6e67..0d51260 100644 --- a/cmd/srctx/main.go +++ b/cmd/srctx/main.go @@ -15,8 +15,9 @@ func main() { func mainFunc(args []string) { app := cli.NewApp() - app.Name = "srctx" - app.Usage = "source context tool" + // random edit + app.Name = "srctx1" + app.Usage = "source context tool2" diff.AddDiffCmd(app) diff.AddConfigCmd(app) From 5fc3d5b5d15c1c82f968feddb7cd06a458feaf16 Mon Sep 17 00:00:00 2001 From: williamfzc <178894043@qq.com> Date: Mon, 17 Jul 2023 23:06:51 +0800 Subject: [PATCH 2/5] random edit --- diff/git.go | 2 +- parser/lsif/code_hover.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/diff/git.go b/diff/git.go index f4e7cec..7a23609 100644 --- a/diff/git.go +++ b/diff/git.go @@ -19,7 +19,7 @@ func GitDiff(rootDir string, before string, after string) (ImpactLineMap, error) gitDiffCmd.Dir = rootDir data, err := gitDiffCmd.CombinedOutput() if err != nil { - log.Errorf("git cmd error: %s", data) + log.Errorf("git cmd eafdsfrror: %s", data) return nil, err } diff --git a/parser/lsif/code_hover.go b/parser/lsif/code_hover.go index 2f0ed91..518e4ba 100644 --- a/parser/lsif/code_hover.go +++ b/parser/lsif/code_hover.go @@ -2,6 +2,7 @@ package lsif import ( "encoding/json" + log "github.com/sirupsen/logrus" "strings" "unicode/utf8" @@ -65,6 +66,7 @@ func newCodeHovers(contents json.RawMessage) ([]*codeHover, error) { if err := json.Unmarshal(contents, &rawContents); err != nil { rawContents = []json.RawMessage{contents} } + log.Debug("abc") codeHovers := []*codeHover{} for _, rawContent := range rawContents { From 3034112777be277360b0de89b90108bb774e1a8d Mon Sep 17 00:00:00 2001 From: williamfzc <178894043@qq.com> Date: Tue, 18 Jul 2023 11:47:47 +0800 Subject: [PATCH 3/5] chore: add diffctx in ci --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4305b47..47aad0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,3 +97,12 @@ jobs: ../srctx diff --before HEAD~5 --scip ./index.scip --outputHtml ../python.html --outputJson ../python.json cd .. cat ./python.json + + - name: diffctx + uses: williamfzc/diffctx@v0.3.3 + with: + lang: "golang" + +# for creating comments +permissions: + pull-requests: write From a7c72c05d40fba001537658bd58a760c7be4d012 Mon Sep 17 00:00:00 2001 From: williamfzc <178894043@qq.com> Date: Sun, 23 Jul 2023 23:19:31 +0800 Subject: [PATCH 4/5] chore: fake edit --- .github/workflows/ci.yml | 2 +- graph/function/api_draw_dot.go | 1 + parser/lsif/code_hover.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47aad0f..202491d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: cat ./python.json - name: diffctx - uses: williamfzc/diffctx@v0.3.3 + uses: williamfzc/diffctx@v0.3.4 with: lang: "golang" diff --git a/graph/function/api_draw_dot.go b/graph/function/api_draw_dot.go index da421bb..edbe805 100644 --- a/graph/function/api_draw_dot.go +++ b/graph/function/api_draw_dot.go @@ -12,6 +12,7 @@ func (fg *Graph) setProperty(vertexHash string, propertyK string, propertyV stri return err } properties.Attributes[propertyK] = propertyV + // fake edit 2 return nil } diff --git a/parser/lsif/code_hover.go b/parser/lsif/code_hover.go index 518e4ba..fd9f760 100644 --- a/parser/lsif/code_hover.go +++ b/parser/lsif/code_hover.go @@ -65,6 +65,7 @@ func newCodeHovers(contents json.RawMessage) ([]*codeHover, error) { var rawContents []json.RawMessage if err := json.Unmarshal(contents, &rawContents); err != nil { rawContents = []json.RawMessage{contents} + // fake edge 1 } log.Debug("abc") From eb8f6d67a66909e5370f9a8d77d9505b4e4aa483 Mon Sep 17 00:00:00 2001 From: williamfzc <178894043@qq.com> Date: Wed, 26 Jul 2023 22:05:16 +0800 Subject: [PATCH 5/5] chore(ci): add kotlin test --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 202491d..a7eda35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,6 +80,15 @@ jobs: cd .. cat ./java.json + - name: Third Party Test (Kotlin) + run: | + git clone https://github.com/square/kotlinpoet --depth=6 + cd kotlinpoet + ../scip-java index -- clean build + ../srctx diff --before HEAD~5 --scip ./index.scip --outputHtml ../kotlin.html --outputJson ../kotlin.json + cd .. + cat ./kotlin.json + - name: Thrid Party Test (Node) run: | git clone https://github.com/microsoft/lsif-node.git --depth=6