From a4c30fe1cacb41213611303ebbf0c0d11d351051 Mon Sep 17 00:00:00 2001
From: shangyan <Merlin0220@163.com>
Date: Thu, 26 Jan 2023 22:47:51 +0800
Subject: [PATCH 1/2] merlin first commit

---
 .idea/git-test.iml        |  4 +++
 .idea/vcs.xml             |  6 ++++
 .idea/workspace.xml       | 69 +++++++++++++++++++++++++++++++++++++++
 go.mod                    |  3 ++
 mone/m_test_one.go        |  7 ++++
 one/texas_test_one.go     |  8 +++--
 three/texas_test_three.go |  8 +++--
 two/texas_test_two.go     |  8 +++--
 8 files changed, 104 insertions(+), 9 deletions(-)
 create mode 100644 .idea/git-test.iml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 go.mod
 create mode 100644 mone/m_test_one.go

diff --git a/.idea/git-test.iml b/.idea/git-test.iml
new file mode 100644
index 0000000..7ee078d
--- /dev/null
+++ b/.idea/git-test.iml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="Go" enabled="true" />
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..0899d19
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="ALL" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="9d45b08c-1436-4e82-8401-a2e56af15bd2" name="变更" comment="">
+      <change afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/mone/m_test_one.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/one/texas_test_one.go" beforeDir="false" afterPath="$PROJECT_DIR$/one/texas_test_one.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/three/texas_test_three.go" beforeDir="false" afterPath="$PROJECT_DIR$/three/texas_test_three.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/two/texas_test_two.go" beforeDir="false" afterPath="$PROJECT_DIR$/two/texas_test_two.go" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Go File" />
+      </list>
+    </option>
+  </component>
+  <component name="GOROOT" url="file:///usr/local/go" />
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="2Kg1ML60qTv9jiJ2AYO1Pb7QHoI" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "DefaultGoTemplateProperty": "Go File",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.go.formatter.settings.were.checked": "true",
+    "RunOnceActivity.go.migrated.go.modules.settings": "true",
+    "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "go.import.settings.migrated": "true",
+    "go.sdk.automatically.set": "true",
+    "last_opened_file_path": "/Users/shangyan/qbox/git-test",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+  </component>
+  <component name="VgoProject">
+    <settings-migrated>true</settings-migrated>
+  </component>
+</project>
\ No newline at end of file
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..325958c
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module example.com
+
+go 1.19
diff --git a/mone/m_test_one.go b/mone/m_test_one.go
new file mode 100644
index 0000000..f85517e
--- /dev/null
+++ b/mone/m_test_one.go
@@ -0,0 +1,7 @@
+package mone
+
+import "fmt"
+
+func www() {
+	fmt.Println("wwww")
+}
diff --git a/one/texas_test_one.go b/one/texas_test_one.go
index 0a636e4..a5e5ccb 100644
--- a/one/texas_test_one.go
+++ b/one/texas_test_one.go
@@ -1,5 +1,7 @@
 package one
 
-func aaa(){
-	fmt.println("aaaaaaaaa")
-}
\ No newline at end of file
+import "fmt"
+
+func aaa() {
+	fmt.Println("aaaaaaaaa")
+}
diff --git a/three/texas_test_three.go b/three/texas_test_three.go
index 9f53159..2373f23 100644
--- a/three/texas_test_three.go
+++ b/three/texas_test_three.go
@@ -1,5 +1,7 @@
 package three
 
-func bbb(){
-	fmt.println("bbbbbbbb")
-}
\ No newline at end of file
+import "fmt"
+
+func bbb() {
+	fmt.Println("aaaaaaaaa")
+}
diff --git a/two/texas_test_two.go b/two/texas_test_two.go
index 0f9c527..f801203 100644
--- a/two/texas_test_two.go
+++ b/two/texas_test_two.go
@@ -1,5 +1,7 @@
 package two
 
-func ccc(){
-	fmt.println("ccc")
-}
\ No newline at end of file
+import "fmt"
+
+func ccc() {
+	fmt.Println("aaaaaaaaa")
+}

From ffd2e770f2a65b64920a73a27279cd851e047a5a Mon Sep 17 00:00:00 2001
From: shangyan <Merlin0220@163.com>
Date: Thu, 26 Jan 2023 22:55:48 +0800
Subject: [PATCH 2/2] delete .idea

---
 .idea/git-test.iml  |  4 ---
 .idea/vcs.xml       |  6 ----
 .idea/workspace.xml | 69 ---------------------------------------------
 3 files changed, 79 deletions(-)
 delete mode 100644 .idea/git-test.iml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/git-test.iml b/.idea/git-test.iml
deleted file mode 100644
index 7ee078d..0000000
--- a/.idea/git-test.iml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="Go" enabled="true" />
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 0899d19..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="ALL" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="9d45b08c-1436-4e82-8401-a2e56af15bd2" name="变更" comment="">
-      <change afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mone/m_test_one.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/one/texas_test_one.go" beforeDir="false" afterPath="$PROJECT_DIR$/one/texas_test_one.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/three/texas_test_three.go" beforeDir="false" afterPath="$PROJECT_DIR$/three/texas_test_three.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/two/texas_test_two.go" beforeDir="false" afterPath="$PROJECT_DIR$/two/texas_test_two.go" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Go File" />
-      </list>
-    </option>
-  </component>
-  <component name="GOROOT" url="file:///usr/local/go" />
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="2Kg1ML60qTv9jiJ2AYO1Pb7QHoI" />
-  <component name="ProjectLevelVcsManager">
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
-    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "DefaultGoTemplateProperty": "Go File",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.go.formatter.settings.were.checked": "true",
-    "RunOnceActivity.go.migrated.go.modules.settings": "true",
-    "RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "go.import.settings.migrated": "true",
-    "go.sdk.automatically.set": "true",
-    "last_opened_file_path": "/Users/shangyan/qbox/git-test",
-    "node.js.detected.package.eslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-  </component>
-  <component name="VgoProject">
-    <settings-migrated>true</settings-migrated>
-  </component>
-</project>
\ No newline at end of file