CL-2021.2.1 <fuwnz@FUWN-PC Merge branch 'master'

Conflicts:
	ide.general.xml

4 files changed, 10 insertions, 0 deletions

diff --git a/codeLens.xml b/codeLens.xml
new file mode 100644
index 0000000..03c48e2
--- /dev/null
+++ b/codeLens.xml
@@ -0,0 +1,7 @@
+<application>
+  <component name="CodeLensSettings">
+    <enabled>
+      <map />
+    </enabled>
+  </component>
+</application>
\ No newline at end of file
diff --git a/editor.xml b/editor.xml
index 11fc7fc..6bc9835 100644
--- a/editor.xml
+++ b/editor.xml
@@ -5,6 +5,7 @@
   </component>
   <component name="CodeInsightSettings">
     <option name="SHOW_FULL_SIGNATURES_IN_PARAMETER_INFO" value="true" />
+    <option name="INSERT_BRACE_ON_ENTER" value="false" />
   </component>
   <component name="DefaultFont">
     <option name="FONT_SIZE" value="17" />
diff --git a/ui.lnf.xml b/ui.lnf.xml
index 1bc7567..b28b800 100644
--- a/ui.lnf.xml
+++ b/ui.lnf.xml
@@ -2,6 +2,7 @@
   <component name="UISettings">
     <option name="CONSOLE_COMMAND_HISTORY_LIMIT" value="1000" />
     <option name="CONSOLE_CYCLE_BUFFER_SIZE_KB" value="10240" />
+    <option name="MAX_LOOKUP_WIDTH2" value="1000" />
     <option name="OVERRIDE_CONSOLE_CYCLE_BUFFER_SIZE" value="true" />
     <option name="showTreeIndentGuides" value="true" />
   </component>
diff --git a/vcs.xml b/vcs.xml
index 3028126..0b11c6b 100644
--- a/vcs.xml
+++ b/vcs.xml
@@ -1,5 +1,6 @@
 <application>
   <component name="VcsApplicationSettings">
     <option name="COMMIT_FROM_LOCAL_CHANGES" value="true" />
+    <option name="SHOW_EDITOR_PREVIEW_ON_DOUBLE_CLICK" value="false" />
   </component>
 </application>
\ No newline at end of file