From 4698c8e5f72c43d383b3824cd3e3d39a5ca69e4a Mon Sep 17 00:00:00 2001
From: Cody Lerum <cody.lerum@gmail.com>
Date: Tue, 25 Jan 2022 08:10:21 -0800
Subject: [PATCH] intellij project files update

Current versions of Intellij are failing to parse the current vcs.xml file as it has a comment before the optional xml declaration.

![image](https://user-images.githubusercontent.com/217262/148092170-f45c06bc-d79a-40d4-878e-04d146d04648.png)

I've updated that to not complain as well as added another entry for the .gitignore for a common intellij plugin. This should make it easier for contributors to open the project. Currently on a fresh clone you get a dirty vcs.xml file.

Fixes #2799

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/error-prone/pull/2799 from codylerum:intellij_excludes 2793f0cc5db8bdcd28ecd5eccde6a8143553a3b6
PiperOrigin-RevId: 424084925
---
 .gitignore    | 1 +
 .idea/vcs.xml | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4a70d02b723..a389004c5f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 
 # intellij
 .idea/ant.xml
+.idea/codestream.xml
 .idea/codeStyleSettings.xml
 .idea/compiler.xml
 .idea/copyright
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 1c4144e1b6f..c8923c2f014 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -13,12 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$USER_HOME$/maven/maven-plugins/maven-shade-plugin" vcs="svn" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
-