chore: generate VSCode file into the .vscode dir

mdelapenya · Aug 29, 2023 · f4acc65 · f4acc65
1 parent 3f641cf
commit f4acc65
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 100 deletions.
diff --git a/.testcontainers-go.code-workspace b/.testcontainers-go.code-workspace
diff --git a/modulegen/_template/testcontainers-go.code-workspace.tmpl b/modulegen/_template/testcontainers-go.code-workspace.tmpl
@@ -3,17 +3,17 @@
 {
         "folders": [
                 {
-                        "path": "src/github.com/testcontainers/testcontainers-go"
+                        "path": "{{ .RootDir }}"
                 },
                 {{ range  .Examples }}{
-                        "path": "src/github.com/testcontainers/testcontainers-go/examples/{{ . }}"
+                        "path": "{{ . }}"
                 },
                 {{ end }}
                 {{ range  .Modules }}{
-                        "path": "src/github.com/testcontainers/testcontainers-go/modules/{{ . }}"
+                        "path": "{{ . }}"
                 },
                 {{ end }}{
-                        "path": "src/github.com/testcontainers/testcontainers-go/modulegen"
+                        "path": "{{ .ModuleGeneratorDir }}"
                 }
         ],
         "settings": {}

diff --git a/modulegen/context.go b/modulegen/context.go
@@ -88,6 +88,10 @@ func (ctx *Context) MkdocsConfigFile() string {
 	return filepath.Join(ctx.RootDir, "mkdocs.yml")
 }
 
+func (ctx *Context) VSCodeWorkspaceFile() string {
+	return filepath.Join(ctx.RootDir, ".testcontainers-go.code-workspace")
+}
+
 func NewContext(dir string) *Context {
 	return &Context{RootDir: dir}
 }
diff --git a/modulegen/internal/vscode/main.go b/modulegen/internal/vscode/main.go
@@ -8,14 +8,14 @@ import (
 )
 
 func Generate(rootDir string, examples []string, modules []string) error {
-	projectDirectories := newProjectDirectories(examples, modules)
+	projectDirectories := newProjectDirectories(rootDir, examples, modules)
 	name := "testcontainers-go.code-workspace.tmpl"
 	t, err := template.New(name).ParseFiles(filepath.Join("_template", name))
 	if err != nil {
 		return err
 	}
 
-	exampleFilePath := filepath.Join(rootDir, ".testcontainers-go.code-workspace")
+	exampleFilePath := filepath.Join(rootDir, ".vscode", ".testcontainers-go.code-workspace")
 
 	return internal_template.GenerateFile(t, exampleFilePath, name, projectDirectories)
 }
diff --git a/modulegen/internal/vscode/types.go b/modulegen/internal/vscode/types.go
@@ -1,13 +1,34 @@
 package vscode
 
+import "path/filepath"
+
 type ProjectDirectories struct {
-	Examples []string
-	Modules  []string
+	RootDir            string
+	ModuleGeneratorDir string
+	Examples           []string
+	Modules            []string
 }
 
-func newProjectDirectories(examples []string, modules []string) *ProjectDirectories {
+func newProjectDirectories(rootDir string, examples []string, modules []string) *ProjectDirectories {
+	rootDirAbs, err := filepath.Abs(rootDir)
+	if err != nil {
+		rootDirAbs = rootDir
+	}
+
+	moduleGeneratorDirAbs := filepath.Join(rootDirAbs, "modulegen")
+
+	for i, example := range examples {
+		examples[i] = filepath.Join(rootDirAbs, "examples", example)
+	}
+
+	for i, module := range modules {
+		modules[i] = filepath.Join(rootDirAbs, "modules", module)
+	}
+
 	return &ProjectDirectories{
-		Examples: examples,
-		Modules:  modules,
+		RootDir:            rootDirAbs,
+		ModuleGeneratorDir: moduleGeneratorDirAbs,
+		Examples:           examples,
+		Modules:            modules,
 	}
 }