WS-2022.1.1 <debuggerx@debuggerx Merge branch 'master'

Conflicts:
	FeatureSuggester.xml
	editor-font.xml
	vcs.xml
master
DebuggerX 3 years ago
commit 270a1d1e9b

@ -1,6 +1,25 @@
<application>
<component name="DiffSettings">
<option name="PLACES_MAP">
<entry key="ChangesView">
<PlaceSettings>
<option name="DIFF_TOOLS_ORDER">
<list>
<option value="com.intellij.diff.tools.simple.SimpleDiffTool" />
<option value="com.intellij.diff.tools.fragmented.UnifiedDiffTool" />
<option value="com.intellij.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool" />
<option value="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool" />
<option value="com.intellij.diff.tools.combined.CombinedUnifiedDiffTool" />
<option value="com.intellij.diff.tools.combined.CombinedSideBySideDiffTool" />
<option value="org.jetbrains.idea.svn.difftool.properties.SvnPropertiesDiffTool" />
<option value="org.jetbrains.idea.svn.difftool.SvnPhantomChangeDiffRequestProvider.SvnPhantomDiffTool" />
<option value="org.jetbrains.idea.svn.difftool.SvnTreeConflictDiffRequestProvider.SvnTreeConflictDiffTool" />
<option value="com.intellij.diff.tools.binary.BinaryDiffTool" />
<option value="com.intellij.diff.tools.dir.DirDiffTool" />
</list>
</option>
</PlaceSettings>
</entry>
<entry key="CommitDialog">
<PlaceSettings>
<option name="DIFF_TOOLS_ORDER">

@ -1,9 +1,7 @@
<application>
<component name="FindSettings">
<option name="caseSensitive" value="true" />
<option name="customScope" value="All Places" />
<option name="defaultScopeName" value="All Places" />
<option name="CASE_SENSITIVE_SEARCH" value="true" />
<option name="SEARCH_SCOPE" value="All Places" />
<mask>*.properties</mask>
<mask>*.html</mask>

@ -0,0 +1,7 @@
<application>
<component name="github-copilot">
<option name="signinNotificationShown" value="true" />
<option name="showIdeCompletions" value="true" />
<option name="telemetryTermsAcceptedDate" value="2022-03-24T15:38:13.074333+08:00[Asia/Shanghai]" />
</component>
</application>

@ -1,7 +1,7 @@
<application>
<component name="NodeJsLocalInterpreterManager">
<local-interpreter path="/usr/local/bin/node">
<version-cache version="16.14.0" last-modified="1645547054563" />
<version-cache version="16.14.0" last-modified="1645760847866" />
</local-interpreter>
<local-interpreter path="$APPLICATION_CONFIG_DIR$/node/node-v12.13.1-linux-x64/bin/node" />
<local-interpreter path="/bin/node" />

@ -18,6 +18,9 @@
<version value="1.0.1-2" url="https://registry.npmjs.org/@web-types/bootstrap-vue/-/bootstrap-vue-1.0.1-2.tgz" />
<version value="1.0.0-2" url="https://registry.npmjs.org/@web-types/bootstrap-vue/-/bootstrap-vue-1.0.0-2.tgz" />
</package>
<package name="@web-types/lit">
<version value="2.0.0-3" url="https://registry.npmjs.org/@web-types/lit/-/lit-2.0.0-3.tgz" />
</package>
<package name="@web-types/quasar">
<version value="1.1.0-1" url="https://registry.npmjs.org/@web-types/quasar/-/quasar-1.1.0-1.tgz" />
<version value="1.0.5-1" url="https://registry.npmjs.org/@web-types/quasar/-/quasar-1.0.5-1.tgz" />

@ -1,11 +1,19 @@
<application>
<component name="AppStorage">
<option name="newTranslationDialogCollapseDictViewer" value="false" />
<option name="newTranslationDialogWidth" value="588" />
<option name="newTranslationDialogHeight" value="261" />
<option name="newTranslationDialogWidth" value="586" />
<option name="newTranslationDialogX" value="558" />
<option name="newTranslationDialogY" value="750" />
<option name="pinNewTranslationDialog" value="true" />
<option name="newTranslationDialogY" value="420" />
<histories>
<item value="symptom" />
<item value="factor" />
<item value="zise" />
<item value="purpose" />
<item value="purpos" />
<item value="get Warning Report" />
<item value="user daily" />
<item value="昨日" />
<item value="docker-tips-and-tricks" />
<item value="fix: color code with opacity will cause some strange issue in echarts." />
<item value="refactor: remove useless code before switch scope." />
@ -48,19 +56,11 @@
<item value="trachea" />
<item value="intestinal" />
<item value="spine" />
<item value="spleen" />
<item value="lymph" />
<item value="lung" />
<item value="boundary Gap" />
<item value="category" />
<item value="implement" />
<item value="实现" />
<item value="问卷" />
</histories>
<option name="languageScores">
<map>
<entry key="CHINESE" value="194" />
<entry key="ENGLISH" value="195" />
<entry key="CHINESE" value="200" />
<entry key="ENGLISH" value="201" />
<entry key="FRENCH" value="1" />
<entry key="DUTCH" value="1" />
<entry key="CATALAN" value="1" />
@ -75,9 +75,6 @@
</option>
</component>
<component name="Cache">
<option name="lastTrimTime" value="1645766704182" />
</component>
<component name="Settings">
<option name="translateDocumentation" value="true" />
<option name="lastTrimTime" value="1651064660595" />
</component>
</application>
Loading…
Cancel
Save