Commits

Nerzhul500  committed c8bd579

Merge from Pro version

  • Participants
  • Parent commits 5dcf299
  • Branches resharper7

Comments (0)

Files changed (12)

File ReSpeller.Installer/Setup.wxs

 ďťż<?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="2857ED7D-CBCA-492C-9FC2-3ED93534DF19"
-    Name="ReSpeller for ReSharper $(var.rsver)"
+  <?define ProductVersion="2.3.0"?>
+  <Product Id="*"
+    Name="ReSpeller Free $(var.ProductVersion) for ReSharper $(var.rsver)"
     Language="1033"
-    Version="2.0.3"
-    UpgradeCode="A6DB0C4A-75BA-4EA4-8F9C-A9F89EDAFFF6"
-    Manufacturer="Artem Bukhonov aka Nerzhul500">
-
-    <Package Description="#Description"
+    Version="$(var.ProductVersion)"
+    UpgradeCode="2857ED7D-CBCA-492C-9FC2-3ED93534DF19"
+    Manufacturer="Ethereal Code">
+    <Package Description="Spell Checker for ReSharper"
       Comments="Comments"
       InstallerVersion="200"
       Compressed="yes"
       ShortNames="no" 
       AdminImage="no"/>
 
-    <InstallExecuteSequence>
-      <RemoveExistingProducts After="InstallInitialize" />
-    </InstallExecuteSequence>
+
+    <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+
+    <MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of this application is already installed."/>
 
     <Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
 
-<!--    <Icon Id="ProductIcon" SourceFile="icon.ico"/>-->
-<!--    <Property Id="ARPPRODUCTICON">ProductIcon</Property>-->
+    <Icon Id="ProductIcon" SourceFile="icon128.ico"/>
+    <Property Id="ARPPRODUCTICON" Value="ProductIcon"/>
 
     <Property Id="RESHARPERDIR2010" Secure="yes">
       <RegistrySearch Id="RSInstallRegistry2010" Root="HKLM" Key="Software\JetBrains\ReSharper\v$(var.rsver)\vs10.0"
                     <File Source="$(var.binlib)\ReSpeller.dll" Vital="yes"/>
                     <File Source="$(var.binlib)\NHunspell.dll" Vital="yes"/>
                     <File Source="$(var.binlib)\Hunspellx86.dll" Vital="yes"/>
+                    <File Source="$(var.binlib)\Hunspellx64.dll" Vital="yes"/>
                     <File Source="$(var.binlib)\WPFToolkit.dll" Vital="yes"/>
                     <File Source="$(var.binlib)\WPFToolkit.Extended.dll" Vital="yes"/>
                     <RemoveFolder Id="R.ReSpeller" On="uninstall" />

File ReSpeller.Installer/icon128.ico

Added
New image

File ReSpeller.RSTests/ReSpeller7.1.RSTests.csproj

     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="SpellEngine\SuggestionGeneratorStub.cs" />
     <Compile Include="VBasicHighlightingsTest.cs" />
     <Compile Include="XmlHighlightingsTest.cs" />
     <Compile Include="CSharpHighlightingsTest.cs" />

File ReSpeller.RSTests/SpellEngine/SpellCheckerTest.cs

 namespace ReSpeller.RSTests.SpellEngine
 {
   [ShellComponent]
-  public class SpellCheckerTest : ISpellChecker, ISingleLanguageWordStorage
+  public class SpellCheckerStub : ISpellChecker, ISingleLanguageWordStorage
   {
     public bool CheckWordSpelling(string word)
     {

File ReSpeller.RSTests/SpellEngine/SuggestionGeneratorStub.cs

+ďťżusing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JetBrains.Application;
+using ReSpeller.SpellEngine;
+
+namespace ReSpeller.RSTests.SpellEngine
+{
+    [ShellComponent]
+    public class SuggestionGeneratorStub : SuggestionGenerator
+    {
+        public SuggestionGeneratorStub(ISpellChecker checker) : base(checker)
+        {
+        }
+    }
+}

File ReSpeller/Actions/AboutAction.cs

         .FirstOrDefault(o => o is AssemblyFileVersionAttribute);
       
       MessageBox.Show(
-        (pluginDescription != null ? pluginDescription.Text : "<no description>") + "\r\nŠ 2012 Artem Bukhonov aka Nerzhul",
+        (pluginDescription != null ? pluginDescription.Text : "<no description>"),
         "About ReSpeller " + (assemblyVersion != null ? "v." + assemblyVersion.Version : ""),
         MessageBoxButtons.OK,
         MessageBoxIcon.Information);

File ReSpeller/Actions/SpaceshipAction.cs

         public void Execute(IDataContext context, DelegateExecute nextExecute)
         {
             MessageBox.Show("I'm sorry, Dave. I'm afraid I can't give you a spaceship. \r\n" +
-                            "I'm just a spell checker, not a spaceship factory",
+                            "I'm just a spell checker, not a spaceship factory.",
                 "Spaceship",
                 MessageBoxButtons.OK,
                 MessageBoxIcon.Information);

File ReSpeller/Analyzers/AnalyzerHelper.cs

       NamingManager namingManager = psiServices.Naming;
       PsiLanguageType psiLanguageType = treeNode.GetKnownLanguage();
       IPsiSourceFile psiSourceFile = treeNode.GetSourceFile();
-      NamingPolicy policy = psiServices.Naming.Policy
+
+      NamingPolicy policy;
+      if (declaredElement == null)
+      {
+        policy = psiServices.Naming.Policy
+                            .GetPolicy(NamedElementKinds.Other, psiLanguageType, psiSourceFile);
+      }
+      else
+      {
+        policy = psiServices.Naming.Policy
         .GetPolicy(declaredElement, psiLanguageType, psiSourceFile);
+      }
+
       INamingPolicyProvider namingPolicyProvider = psiServices.Naming.Policy
         .GetPolicyProvider(psiLanguageType, psiSourceFile);
 

File ReSpeller/Properties/AssemblyInfo.cs

 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("ReSpeller Beta")]
+[assembly: AssemblyTitle("ReSpeller")]
 [assembly: AssemblyDescription("Spell Checker for Resharper")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Artem Bukhonov")]
+[assembly: AssemblyCompany("Ethereal Code")]
 [assembly: AssemblyProduct("ReSpeller")]
-[assembly: AssemblyCopyright("Copyright Š Artem Bukhonov, 2012")]
+[assembly: AssemblyCopyright("Copyright Š Ethereal Code, 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("2.0.3.0")]
-[assembly: AssemblyFileVersion("2.0.3.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
 [assembly: ActionsXml("SpellCheckerPlugin.Actions.xml")]
 
 // The following information is displayed by ReSharper in the Plugins dialog
 
-[assembly: PluginTitle("ReSpeller Beta")]
+[assembly: PluginTitle("ReSpeller")]
 [assembly:
   PluginDescription(
     "Spell Checker for Resharper based on NHunspell library. Dictionaries taken from IntelliJ IDEA Community Edition repository\n" +
-    "Special thanks to Dmitri Nesteruk, Matt Ellis and other ReSharper teammates, who helps me with developing\n" +
-    "Copyright Š Artem Bukhonov, 2012"
+    "Special thanks to Dmitri Nesteruk, Matt Ellis and other ReSharper teammates, who help me with developing\n" +
+    "Copyright Š Ethereal Code, 2012"
     )]
-[assembly: PluginVendor("Artem Bukhonov")]
+[assembly: PluginVendor("Ethereal Code")]
 [assembly:
    RegisterConfigurableSeverity(
          IdentifierTypoHighlighting.SeverityId,

File ReSpeller/ReSpeller7.1.csproj

     </Page>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\lib\Hunspellx64.dll">
+      <Link>Hunspellx64.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="..\lib\Hunspellx86.dll">
       <Link>Hunspellx86.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

File ReSpeller/SpellEngine/SuggestionGenerator.cs

 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Application;
+using JetBrains.Application.Components;
 
 namespace ReSpeller.SpellEngine
 {
-  [ShellComponent]
+  [ShellComponent(ProgramConfigurations.VS_ADDIN)]
   public class SuggestionGenerator
   {
     private readonly ISpellChecker myChecker;

File lib/Hunspellx64.dll

Binary file added.